Makefile: fix parallel "make test"
When building the "test" target we depend on both cgit and building the Git tools. By doing this with two targets we end up running make in the git/ directory twice, concurrently if using parallel make, which causes us to build more than we need and potentially builds incorrectly if multi-step build-then-move operations overlap. Fix this by instead calling back into the makefile so that we alter the "cgit" target to also build the Git tools. Signed-off-by: John Keeping <john@keeping.me.uk>
This commit is contained in:
父節點
f75900b04f
當前提交
c2b79dd8e0
8
Makefile
8
Makefile
@ -64,12 +64,10 @@ endif
|
||||
all:: cgit
|
||||
|
||||
cgit:
|
||||
$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk ../cgit NO_CURL=1
|
||||
$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk ../cgit $(EXTRA_GIT_TARGETS) NO_CURL=1
|
||||
|
||||
git:
|
||||
$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1
|
||||
|
||||
test: all git
|
||||
test:
|
||||
@$(MAKE) --no-print-directory cgit EXTRA_GIT_TARGETS=all
|
||||
$(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
|
||||
|
||||
install: all
|
||||
|
載入中…
新增問題並參考
Block a user