summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Vagg <rod@vagg.org>2018-12-19 17:54:59 +1100
committerRod Vagg <rod@vagg.org>2018-12-20 09:30:38 +1100
commit6aef79b3d8fcadcff449c99bdb3d05a74d8e26e7 (patch)
tree0aa2424483734e6961a31c64d91499e8c2912378
parent3edc1c917b6f678b9146b99daf91cc478cd0e8c3 (diff)
downloadnode-new-rvagg/run-ci-jobs.tar.gz
build: -j for build-cirvagg/run-ci-jobs
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3cbf6118a9..6b99767254 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,10 @@ PWD = $(CURDIR)
ifdef JOBS
PARALLEL_ARGS = -j $(JOBS)
+ PARALLEL_MAKE_ARGS = -j $(JOBS)
else
PARALLEL_ARGS = -J
+ PARALLEL_MAKE_ARGS =
endif
ifdef ENABLE_V8_TAP
@@ -96,11 +98,11 @@ help: ## Print help for targets with comments.
# and recreated which can break the addons build when running test-ci
# See comments on the build-addons target for some more info
$(NODE_EXE): config.gypi out/Makefile
- $(MAKE) -C out BUILDTYPE=Release V=$(V)
+ $(MAKE) -C out BUILDTYPE=Release V=$(V) $(PARALLEL_MAKE_ARGS)
if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Release/$(NODE_EXE) $@; fi
$(NODE_G_EXE): config.gypi out/Makefile
- $(MAKE) -C out BUILDTYPE=Debug V=$(V)
+ $(MAKE) -C out BUILDTYPE=Debug V=$(V) $(PARALLEL_MAKE_ARGS)
if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi
CODE_CACHE_DIR ?= out/$(BUILDTYPE)/obj/gen
@@ -503,7 +505,7 @@ test-ci: | clear-stalled build-addons build-js-native-api-tests build-node-api-t
# Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned
build-ci:
$(PYTHON) ./configure --verbose $(CONFIG_FLAGS)
- $(MAKE)
+ $(MAKE) $(PARALLEL_MAKE_ARGS)
.PHONY: run-ci
# Run by CI tests, exceptions: