Skip to content

Commit 06d53b3

Browse files
committed
Makefile: adjust default target, broaden all target
Previously the default target ('all') built the rustls-ffi static library and the client/server example binaries. This commit adds a new default target ('default') that only builds the static lib. It also updates 'all' to include integration and connect-tests to truly be all the things.
1 parent eb3ccfa commit 06d53b3

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- name: Build release binaries
6565
run: |
6666
make clean
67-
make CC=${{ matrix.cc }} CRYPTO_PROVIDER=${{ matrix.crypto }} PROFILE=release
67+
make CC=${{ matrix.cc }} CRYPTO_PROVIDER=${{ matrix.crypto }} PROFILE=release test
6868
- name: Verify release builds were not using ASAN
6969
if: runner.os == 'Linux' # For 'nm'
7070
run: |

Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,14 @@ else ifeq ($(CRYPTO_PROVIDER), ring)
3535
CARGOFLAGS += --no-default-features --features ring
3636
endif
3737

38-
all: target/client target/server
38+
default: target/$(PROFILE)/librustls_ffi.a
3939

40-
test: all
40+
all: default test integration connect-test
41+
42+
test: target/client target/server
4143
${CARGO} test ${CARGOFLAGS}
4244

43-
integration: all
45+
integration: test
4446
${CARGO} test ${CARGOFLAGS} -- --ignored
4547

4648
connect-test: target/client
@@ -91,4 +93,4 @@ format-check:
9193
cargo fmt --check
9294
sed -i -e 's/if true {/ffi_panic_boundary! {/g' src/*.rs
9395

94-
.PHONY: all clean test integration format format-check
96+
.PHONY: default all clean test integration format format-check

0 commit comments

Comments
 (0)