diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-01-06 00:28:51 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-01-10 12:10:20 +0100 |
| commit | 1e1d735e5213dac7c582304f58da674714f6aade (patch) | |
| tree | cdf07d9ae1555b8394041935debf44b71d8abdf3 /include | |
| parent | 029b36d9b558423bb25f453dc82023990afbd71d (diff) | |
| download | mtk-20170518-1e1d735e5213dac7c582304f58da674714f6aade.zip mtk-20170518-1e1d735e5213dac7c582304f58da674714f6aade.tar.gz mtk-20170518-1e1d735e5213dac7c582304f58da674714f6aade.tar.bz2 | |
build: remove obsolete parallel build related options
Always use the main make jobserver, which has been the default for ages
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'include')
| -rw-r--r-- | include/host-build.mk | 9 | ||||
| -rw-r--r-- | include/image.mk | 2 | ||||
| -rw-r--r-- | include/package.mk | 9 |
3 files changed, 5 insertions, 15 deletions
diff --git a/include/host-build.mk b/include/host-build.mk index b2f017b..4b4ffe4 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -11,17 +11,12 @@ HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSIO HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install HOST_BUILD_PARALLEL ?= -ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),) - HOST_MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) $(if $(filter 3.% 4.0 4.1,$(MAKE_VERSION)),-j)) -else - HOST_MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS) -endif +HOST_MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) $(if $(filter 3.% 4.0 4.1,$(MAKE_VERSION)),-j)) ifeq ($(strip $(HOST_BUILD_PARALLEL)),0) HOST_JOBS?=-j1 else -HOST_JOBS?=$(if $(HOST_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),\ - $(if $(CONFIG_PKG_BUILD_PARALLEL),$(HOST_MAKE_J),-j1),-j1) +HOST_JOBS?=$(if $(HOST_BUILD_PARALLEL),$(HOST_MAKE_J),-j1) endif include $(INCLUDE_DIR)/host.mk diff --git a/include/image.mk b/include/image.mk index ed96851..3daee35 100644 --- a/include/image.mk +++ b/include/image.mk @@ -197,7 +197,7 @@ define Image/mkfs/squashfs $(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \ -nopad -noappend -root-owned \ -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \ - -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1) \ + -processors 1 \ $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH)) endef diff --git a/include/package.mk b/include/package.mk index 41401dd..3248517 100644 --- a/include/package.mk +++ b/include/package.mk @@ -17,17 +17,12 @@ PKG_BUILD_PARALLEL ?= PKG_USE_MIPS16 ?= 1 PKG_IREMAP ?= 1 -ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),) - MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) $(if $(filter 3.% 4.0 4.1,$(MAKE_VERSION)),-j)) -else - MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS) -endif +MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) $(if $(filter 3.% 4.0 4.1,$(MAKE_VERSION)),-j)) 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),$(MAKE_J),-j1),-j1) +PKG_JOBS?=$(if $(PKG_BUILD_PARALLEL),$(MAKE_J),-j1) endif ifdef CONFIG_USE_MIPS16 ifeq ($(strip $(PKG_USE_MIPS16)),1) |