From 1e1d735e5213dac7c582304f58da674714f6aade Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 6 Jan 2017 00:28:51 +0100 Subject: 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 --- include/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'include/package.mk') diff --git a/include/package.mk b/include/package.mk index 41401ddefb..3248517657 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) -- cgit v1.2.3