summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-09-15 12:16:14 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-09-15 12:16:14 +0000
commit8b591f9808175af2488a324193fa19e00fec0348 (patch)
tree30a1e2e11f0824abb04551a0d8d147276676ba72
parent93ca39cd0c5a0da8a3afbb1e645cdd913af22b44 (diff)
build: move the -j flag to package.mk instead of grabbing it from makeflags, otherwise it occasionally gets omitted on full builds
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33422 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package.mk2
-rw-r--r--include/toplevel.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/package.mk b/include/package.mk
index 6b3617f77..e93aebf67 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -16,7 +16,7 @@ PKG_BUILD_PARALLEL ?=
PKG_INFO_DIR := $(STAGING_DIR)/pkginfo
ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),)
- MAKE_J:=$(MAKE_JOBSERVER)
+ MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) -j)
else
MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS)
endif
diff --git a/include/toplevel.mk b/include/toplevel.mk
index ba5af9c15..5b76a0706 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -148,7 +148,7 @@ prereq:: prepare-tmpinfo .config
echo "WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!"; \
fi \
)
- @+$(SUBMAKE) -r $@ MAKE_JOBSERVER="$(filter --jobserver% -j,$(MAKEFLAGS))"
+ @+$(SUBMAKE) -r $@ MAKE_JOBSERVER="$(filter --jobserver%,$(MAKEFLAGS))"
help:
cat README