diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-14 13:40:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-14 13:40:54 -0700 |
| commit | 21c234873d07bdb32599e8aabaa408f797795492 (patch) | |
| tree | 8266d302a915dc61784c94621712d18915a830e6 | |
| parent | Merge branch 'js/progress-delay-fix' into maint-2.51 (diff) | |
| parent | Makefile: build libgit-rs and libgit-sys serially (diff) | |
| download | git-21c234873d07bdb32599e8aabaa408f797795492.tar.gz git-21c234873d07bdb32599e8aabaa408f797795492.zip | |
Merge branch 'da/cargo-serialize' into maint-2.51
Makefile tried to run multiple "cargo build" which would not work
very well; serialize their execution to work it around.
* da/cargo-serialize:
Makefile: build libgit-rs and libgit-sys serially
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | t/Makefile | 14 |
2 files changed, 9 insertions, 16 deletions
@@ -3945,13 +3945,12 @@ unit-tests: $(UNIT_TEST_PROGS) $(CLAR_TEST_PROG) t/helper/test-tool$X $(MAKE) -C t/ unit-tests .PHONY: libgit-sys libgit-rs -libgit-sys libgit-rs: - $(QUIET)(\ - cd contrib/$@ && \ - cargo build \ - ) +libgit-sys: + $(QUIET)cargo build --manifest-path contrib/libgit-sys/Cargo.toml +libgit-rs: libgit-sys + $(QUIET)cargo build --manifest-path contrib/libgit-rs/Cargo.toml ifdef INCLUDE_LIBGIT_RS -all:: libgit-sys libgit-rs +all:: libgit-rs endif LIBGIT_PUB_OBJS += contrib/libgit-sys/public_symbol_export.o diff --git a/t/Makefile b/t/Makefile index 757674e727..ab8a5b54aa 100644 --- a/t/Makefile +++ b/t/Makefile @@ -189,15 +189,9 @@ perf: .PHONY: libgit-sys-test libgit-rs-test libgit-sys-test: - $(QUIET)(\ - cd ../contrib/libgit-sys && \ - cargo test \ - ) -libgit-rs-test: - $(QUIET)(\ - cd ../contrib/libgit-rs && \ - cargo test \ - ) + $(QUIET)cargo test --manifest-path ../contrib/libgit-sys/Cargo.toml +libgit-rs-test: libgit-sys-test + $(QUIET)cargo test --manifest-path ../contrib/libgit-rs/Cargo.toml ifdef INCLUDE_LIBGIT_RS -all:: libgit-sys-test libgit-rs-test +all:: libgit-rs-test endif |