diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-09-15 12:16:14 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-09-15 12:16:14 +0000 |
| commit | c4198ce48d43af2a2674e9b74f00a024cb043a0c (patch) | |
| tree | e56ffaec03ea541b4e7525cf5c647cf5f3af1b79 | |
| parent | 482a6d4aea0a2e76853b133f3ce40e960a3cd80e (diff) | |
| download | upstream-c4198ce48d43af2a2674e9b74f00a024cb043a0c.tar.gz upstream-c4198ce48d43af2a2674e9b74f00a024cb043a0c.tar.bz2 upstream-c4198ce48d43af2a2674e9b74f00a024cb043a0c.zip | |
build: move the -j flag to package.mk instead of grabbing it from makeflags, otherwise it occasionally gets omitted on full builds
SVN-Revision: 33422
| -rw-r--r-- | include/package.mk | 2 | ||||
| -rw-r--r-- | include/toplevel.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/package.mk b/include/package.mk index 6b3617f776..e93aebf67d 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 ba5af9c155..5b76a0706f 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 |