mirror of https://github.com/hak5/openwrt-owl.git
toolchain: enable parallel build for uClibc, remove the obsolete TOOLCHAIN_PARALLEL config symbol
SVN-Revision: 33807owl
parent
0e1f91b60a
commit
c6ba19c70e
14
Config.in
14
Config.in
|
@ -495,20 +495,6 @@ menu "Global build settings"
|
||||||
Only say Y, if you don't mind fixing broken packages.
|
Only say Y, if you don't mind fixing broken packages.
|
||||||
Before reporting build bugs, set this to N and re-run the build.
|
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"
|
comment "Stripping options"
|
||||||
|
|
||||||
choice
|
choice
|
||||||
|
|
|
@ -11,8 +11,6 @@ REAL_STAGING_DIR_HOST:=$(STAGING_DIR_HOST)
|
||||||
STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
|
STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
|
||||||
BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
|
BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
|
||||||
|
|
||||||
TOOLCHAIN_JOBS?=$(if $(CONFIG_TOOLCHAIN_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS))
|
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/host-build.mk
|
include $(INCLUDE_DIR)/host-build.mk
|
||||||
|
|
||||||
HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared
|
HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared
|
||||||
|
|
|
@ -5,6 +5,8 @@ include ./common.mk
|
||||||
HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built
|
HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built
|
||||||
HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc_installed
|
HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc_installed
|
||||||
|
|
||||||
|
HOST_BUILD_PARALLEL:=1
|
||||||
|
|
||||||
define Host/SetToolchainInfo
|
define Host/SetToolchainInfo
|
||||||
$(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
|
$(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
|
||||||
$(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.uclibc.org/,' $(TOOLCHAIN_DIR)/info.mk
|
$(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.uclibc.org/,' $(TOOLCHAIN_DIR)/info.mk
|
||||||
|
|
|
@ -50,7 +50,7 @@ CPU_CFLAGS = \
|
||||||
-Wno-unused-but-set-variable \
|
-Wno-unused-but-set-variable \
|
||||||
$(TARGET_CFLAGS)
|
$(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) \
|
$(TARGET_CONFIGURE_OPTS) \
|
||||||
DEVEL_PREFIX=/ \
|
DEVEL_PREFIX=/ \
|
||||||
RUNTIME_PREFIX=/ \
|
RUNTIME_PREFIX=/ \
|
||||||
|
|
Loading…
Reference in New Issue