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/host-build.mk | |
| parent | 029b36d9b558423bb25f453dc82023990afbd71d (diff) | |
| download | upstream-1e1d735e5213dac7c582304f58da674714f6aade.tar.gz upstream-1e1d735e5213dac7c582304f58da674714f6aade.tar.bz2 upstream-1e1d735e5213dac7c582304f58da674714f6aade.zip | |
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/host-build.mk')
| -rw-r--r-- | include/host-build.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/host-build.mk b/include/host-build.mk index b2f017bee2..4b4ffe4c9d 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 |