diff options
| author | mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-08-20 14:48:59 +0000 |
|---|---|---|
| committer | mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-08-20 14:48:59 +0000 |
| commit | 9d3a35f2c71eb2730ae2b72d0474e116609509c9 (patch) | |
| tree | 3c4e8d275f426ea64e3081e8958f55b695e101d1 | |
| parent | a90c827ee9ffd44d3adbc47f71e52ca8406ff42a (diff) | |
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
| -rw-r--r-- | Config.in | 14 | ||||
| -rw-r--r-- | include/host-build.mk | 2 | ||||
| -rw-r--r-- | include/package.mk | 2 |
3 files changed, 16 insertions, 2 deletions
@@ -247,6 +247,20 @@ menu "Global build settings" help The number of jobs (-jX) to pass to packages submake. + config PKG_DEFAULT_PARALLEL + bool + prompt "Always parallelize the default package build rule (Dangerous)" + depends on PKG_BUILD_PARALLEL + default n + help + Always set the default package build rules to parallel build. + + WARNING: This may break build or kill your cat, as it builds + packages with multiple jobs that are probably not tested in + a parallel build environment. + + Say N. Only say Y for testing. + comment "Stripping options" choice diff --git a/include/host-build.mk b/include/host-build.mk index acb7f6bbd..4fd6587ae 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 fd53123f6..a07d875f8 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 |