1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 02:23:21 +02:00

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
This commit is contained in:
nbd 2012-10-17 13:03:08 +00:00
parent 83694a1cc9
commit 66898596e6
4 changed files with 3 additions and 17 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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=/ \