aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2010-08-20 14:48:59 +0000
committerMichael Büsch <mb@bu3sch.de>2010-08-20 14:48:59 +0000
commitd8f3c30df1727a06dd4ebefe7b05f738a5c5693b (patch)
tree3c4e8d275f426ea64e3081e8958f55b695e101d1 /include
parentfd1d4f96e5cca7399836b909d6eff7aeb2ee8483 (diff)
downloadupstream-d8f3c30df1727a06dd4ebefe7b05f738a5c5693b.tar.gz
upstream-d8f3c30df1727a06dd4ebefe7b05f738a5c5693b.tar.bz2
upstream-d8f3c30df1727a06dd4ebefe7b05f738a5c5693b.zip
Add an option to default the default build rule to parallel build.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22737 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/host-build.mk2
-rw-r--r--include/package.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/host-build.mk b/include/host-build.mk
index acb7f6bbdf..4fd6587aec 100644
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -8,7 +8,7 @@
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),$(if $(CONFIG_PKG_BUILD_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS)))
+HOST_JOBS ?= $(if $(HOST_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),$(if $(CONFIG_PKG_BUILD_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS)))
include $(INCLUDE_DIR)/host.mk
include $(INCLUDE_DIR)/unpack.mk
diff --git a/include/package.mk b/include/package.mk
index fd53123f61..a07d875f8c 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -11,7 +11,7 @@ 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),$(if $(CONFIG_PKG_BUILD_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS)))
+PKG_JOBS ?= $(if $(PKG_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),$(if $(CONFIG_PKG_BUILD_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS)))
include $(INCLUDE_DIR)/prereq.mk
include $(INCLUDE_DIR)/host.mk