diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-10-17 13:03:08 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-10-17 13:03:08 +0000 |
| commit | 9afeebbea73b7ccde5323a9e58e8ce6ff02b9016 (patch) | |
| tree | b41266e764e91a2b8b89ce89716dca7d787579af | |
| parent | 00e12d10e36f15f24d9eb36b17f4fb70d961ec45 (diff) | |
| download | upstream-9afeebbea73b7ccde5323a9e58e8ce6ff02b9016.tar.gz upstream-9afeebbea73b7ccde5323a9e58e8ce6ff02b9016.tar.bz2 upstream-9afeebbea73b7ccde5323a9e58e8ce6ff02b9016.zip | |
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.in | 14 | ||||
| -rw-r--r-- | include/toolchain-build.mk | 2 | ||||
| -rw-r--r-- | toolchain/uClibc/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/uClibc/common.mk | 2 |
4 files changed, 3 insertions, 17 deletions
@@ -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 d2fdb0281a..a86f6aba77 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 0c2dcd3837..545ea5ae56 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 5f3bd29444..f32ed98729 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=/ \ |