summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-17 13:03:08 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-17 13:03:08 +0000
commit66898596e6eec2452b0fe38cb667e61832246fb3 (patch)
treeb41266e764e91a2b8b89ce89716dca7d787579af
parent83694a1cc9903d56cdb8e12e44becbcda8922fb0 (diff)
toolchain: enable parallel build for uClibc, remove the obsolete TOOLCHAIN_PARALLEL config symbol
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33807 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--Config.in14
-rw-r--r--include/toolchain-build.mk2
-rw-r--r--toolchain/uClibc/Makefile2
-rw-r--r--toolchain/uClibc/common.mk2
4 files changed, 3 insertions, 17 deletions
diff --git a/Config.in b/Config.in
index c023d6079..cca5a4c0f 100644
--- a/Config.in
+++ b/Config.in
@@ -495,20 +495,6 @@ menu "Global build settings"
Only say Y, if you don't mind fixing broken packages.
Before reporting build bugs, set this to N and re-run the build.
- config TOOLCHAIN_PARALLEL
- bool
- prompt "Parallelize the toolchain build (May break build)"
- depends on PKG_BUILD_PARALLEL
- depends on BROKEN
- default n
- help
- Build the toolchain with parallel make jobs.
- This speeds up the toolchain build on SMP machines, but may
- break the build for certain toolchain versions.
-
- If you say Y, toolchain build might break.
- Before reporting build bugs, set this to N and re-run the build.
-
comment "Stripping options"
choice
diff --git a/include/toolchain-build.mk b/include/toolchain-build.mk
index d2fdb0281..a86f6aba7 100644
--- a/include/toolchain-build.mk
+++ b/include/toolchain-build.mk
@@ -11,8 +11,6 @@ REAL_STAGING_DIR_HOST:=$(STAGING_DIR_HOST)
STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
-TOOLCHAIN_JOBS?=$(if $(CONFIG_TOOLCHAIN_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS))
-
include $(INCLUDE_DIR)/host-build.mk
HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 0c2dcd383..545ea5ae5 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -5,6 +5,8 @@ include ./common.mk
HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built
HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc_installed
+HOST_BUILD_PARALLEL:=1
+
define Host/SetToolchainInfo
$(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
$(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.uclibc.org/,' $(TOOLCHAIN_DIR)/info.mk
diff --git a/toolchain/uClibc/common.mk b/toolchain/uClibc/common.mk
index 5f3bd2944..f32ed9872 100644
--- a/toolchain/uClibc/common.mk
+++ b/toolchain/uClibc/common.mk
@@ -50,7 +50,7 @@ CPU_CFLAGS = \
-Wno-unused-but-set-variable \
$(TARGET_CFLAGS)
-UCLIBC_MAKE = PATH='$(TOOLCHAIN_DIR)/initial/bin:$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \
+UCLIBC_MAKE = PATH='$(TOOLCHAIN_DIR)/initial/bin:$(TARGET_PATH)' $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
DEVEL_PREFIX=/ \
RUNTIME_PREFIX=/ \