build: move the -j flag to package.mk instead of grabbing it from makeflags, otherwis...

SVN-Revision: 33422

diff --git a/include/package.mk b/include/package.mk
index 6b3617f7768e347372fd5ee728488dae315ea131..e93aebf67db18424a9158ac970b40dc2175d2c2f 100644 (file)
--- 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 ba5af9c1557bd64b0520e6e96ee2f0ea912a83e8..5b76a0706f275a880828f04785df57c835a7fecb 100644 (file)
--- 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