diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-09-15 10:21:24 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-09-15 10:21:24 +0000 |
| commit | be6f4376498d15b3465027bd78de3a878a862023 (patch) | |
| tree | 1d3d8209907a82535a97acb7ae0efbc75b870112 /include | |
| parent | ed14ffc7da8f2e544c3af0c943e651510cf8341d (diff) | |
| download | upstream-be6f4376498d15b3465027bd78de3a878a862023.tar.gz upstream-be6f4376498d15b3465027bd78de3a878a862023.tar.bz2 upstream-be6f4376498d15b3465027bd78de3a878a862023.zip | |
build: add a config option for passing the top-level make jobserver to packages that have parallel build enabled, significantly improves parallelization and gets rid of CPU overcommit during intra-package parallel builds
SVN-Revision: 33414
Diffstat (limited to 'include')
| -rw-r--r-- | include/package.mk | 8 | ||||
| -rw-r--r-- | include/toplevel.mk | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/package.mk b/include/package.mk index 64973b0510..6b3617f776 100644 --- a/include/package.mk +++ b/include/package.mk @@ -15,11 +15,17 @@ PKG_MD5SUM ?= unknown PKG_BUILD_PARALLEL ?= PKG_INFO_DIR := $(STAGING_DIR)/pkginfo +ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),) + MAKE_J:=$(MAKE_JOBSERVER) +else + MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS) +endif + ifeq ($(strip $(PKG_BUILD_PARALLEL)),0) PKG_JOBS?=-j1 else PKG_JOBS?=$(if $(PKG_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),\ - $(if $(CONFIG_PKG_BUILD_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS),-j1),-j1) + $(if $(CONFIG_PKG_BUILD_PARALLEL),$(MAKE_J),-j1),-j1) endif include $(INCLUDE_DIR)/prereq.mk diff --git a/include/toplevel.mk b/include/toplevel.mk index d37ddb9171..ba5af9c155 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 $@ + @+$(SUBMAKE) -r $@ MAKE_JOBSERVER="$(filter --jobserver% -j,$(MAKEFLAGS))" help: cat README |