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 | d5e0222429704a959dd84bb846cba9dc667c8d3b (patch) | |
| tree | 30a1e2e11f0824abb04551a0d8d147276676ba72 | |
| parent | 2e3918df3307390998bc8f7e976be3abcb78814d (diff) | |
| download | master-187ad058-d5e0222429704a959dd84bb846cba9dc667c8d3b.tar.gz master-187ad058-d5e0222429704a959dd84bb846cba9dc667c8d3b.tar.bz2 master-187ad058-d5e0222429704a959dd84bb846cba9dc667c8d3b.zip | |
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.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 |