diff options
| author | mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-16 18:42:58 +0000 |
|---|---|---|
| committer | mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-16 18:42:58 +0000 |
| commit | 6c7ebb0443d971ee24084605a031771665dfe81b (patch) | |
| tree | 922e8d9b646753cb6406beef67a6408559ab5e1f | |
| parent | d35172a2c25f3dc06968ca75429e182d57bdc128 (diff) | |
Support force-disabling per-package parallel build with {PKG,HOST}_BUILD_PARALLEL:=0
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23480 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/host-build.mk | 8 | ||||
| -rw-r--r-- | include/package.mk | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/host-build.mk b/include/host-build.mk index 4fd6587aec..22bc47d093 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -8,7 +8,13 @@ HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install HOST_BUILD_PARALLEL ?= -HOST_JOBS ?= $(if $(HOST_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),$(if $(CONFIG_PKG_BUILD_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS))) + +ifeq ($(strip $(HOST_BUILD_PARALLEL)),0) +HOST_JOBS?=-j1 +else +HOST_JOBS?=-j$(if $(HOST_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),\ + $(if $(CONFIG_PKG_BUILD_PARALLEL),$(CONFIG_PKG_BUILD_JOBS),1)) +endif include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/unpack.mk diff --git a/include/package.mk b/include/package.mk index a07d875f8c..aed7dd2b8e 100644 --- a/include/package.mk +++ b/include/package.mk @@ -11,7 +11,13 @@ PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install PKG_MD5SUM ?= unknown PKG_BUILD_PARALLEL ?= -PKG_JOBS ?= $(if $(PKG_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),$(if $(CONFIG_PKG_BUILD_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS))) + +ifeq ($(strip $(PKG_BUILD_PARALLEL)),0) +PKG_JOBS?=-j1 +else +PKG_JOBS?=-j$(if $(PKG_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),\ + $(if $(CONFIG_PKG_BUILD_PARALLEL),$(CONFIG_PKG_BUILD_JOBS),1)) +endif include $(INCLUDE_DIR)/prereq.mk include $(INCLUDE_DIR)/host.mk |