admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'da/cargo-serialize'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2025-09-08 14:54:33 -07:00
parent 2462961280 0eeacde50e
commit 8d5e4290a7
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@@ -3945,13 +3945,12 @@ unit-tests: $(UNIT_TEST_PROGS) $(CLAR_TEST_PROG) t/helper/test-tool$X
$(MAKE) -C t/ unit-tests $(MAKE) -C t/ unit-tests
.PHONY: libgit-sys libgit-rs .PHONY: libgit-sys libgit-rs
libgit-sys libgit-rs: libgit-sys:
$(QUIET)(\ $(QUIET)cargo build --manifest-path contrib/libgit-sys/Cargo.toml
cd contrib/$@ && \ libgit-rs: libgit-sys
cargo build \ $(QUIET)cargo build --manifest-path contrib/libgit-rs/Cargo.toml
)
ifdef INCLUDE_LIBGIT_RS ifdef INCLUDE_LIBGIT_RS
all:: libgit-sys libgit-rs all:: libgit-rs
endif endif
LIBGIT_PUB_OBJS += contrib/libgit-sys/public_symbol_export.o LIBGIT_PUB_OBJS += contrib/libgit-sys/public_symbol_export.o

14
t/Makefile
View File

@@ -189,15 +189,9 @@ perf:
.PHONY: libgit-sys-test libgit-rs-test .PHONY: libgit-sys-test libgit-rs-test
libgit-sys-test: libgit-sys-test:
$(QUIET)(\ $(QUIET)cargo test --manifest-path ../contrib/libgit-sys/Cargo.toml
cd ../contrib/libgit-sys && \ libgit-rs-test: libgit-sys-test
cargo test \ $(QUIET)cargo test --manifest-path ../contrib/libgit-rs/Cargo.toml
)
libgit-rs-test:
$(QUIET)(\
cd ../contrib/libgit-rs && \
cargo test \
)
ifdef INCLUDE_LIBGIT_RS ifdef INCLUDE_LIBGIT_RS
all:: libgit-sys-test libgit-rs-test all:: libgit-rs-test
endif endif