28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
# HG changeset patch
|
|
# User sgehwolf
|
|
# Date 1524152606 -7200
|
|
# Thu Apr 19 17:43:26 2018 +0200
|
|
# Node ID f7a3ca673e9cc831848fc890a2df3ae9acb447e4
|
|
# Parent dd26184768b0a1c4103a2e9eaa8b4d852a9eca1b
|
|
8201788: Number of make jobs wrong for bootcycle-images target
|
|
Reviewed-by: erikj, ihse
|
|
|
|
diff --git a/make/Init.gmk b/make/Init.gmk
|
|
--- a/make/Init.gmk
|
|
+++ b/make/Init.gmk
|
|
@@ -310,9 +310,13 @@
|
|
ifneq ($(PARALLEL_TARGETS), )
|
|
$(call StartGlobalTimer)
|
|
$(call PrepareSmartJavac)
|
|
+ # JOBS will only be empty for a bootcycle-images recursive call
|
|
+ # or if specified via a make argument directly. In those cases
|
|
+ # treat it as NOT using jobs at all.
|
|
( cd $(TOPDIR) && \
|
|
$(NICE) $(MAKE) $(MAKE_ARGS) $(OUTPUT_SYNC_FLAG) \
|
|
- -j $(JOBS) -f make/Main.gmk $(USER_MAKE_VARS) \
|
|
+ $(if $(JOBS), -j $(JOBS)) \
|
|
+ -f make/Main.gmk $(USER_MAKE_VARS) \
|
|
$(PARALLEL_TARGETS) $(COMPARE_BUILD_MAKE) $(BUILD_LOG_PIPE) || \
|
|
( exitcode=$$? && \
|
|
$(PRINTF) "\nERROR: Build failed for $(TARGET_DESCRIPTION) (exit code $$exitcode) \n" \
|