ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-02-21 17:26:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #184 from jasmin-j/add_gcc_env_array

Browse Source 
Add additional environment variables for gcc build.
This commit is contained in:
Bryan Hundven 2015-10-07 13:32:53 -07:00
commit 9e9b9bd195
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/cc/gcc.in.2
View File

@ -37,6 +37,16 @@ config CC_GCC_EXTRA_CONFIG_ARRAY
if they are properly quoted (or escaped, but prefer quotes). Eg.: if they are properly quoted (or escaped, but prefer quotes). Eg.:
--with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space
config CC_GCC_EXTRA_ENV_ARRAY
string
prompt "Extra env variables to set for make"
default ""
help
Used to add specific env variables on the make command line for the
gcc build (eg. INHIBIT_LIBC_CFLAGS='-DUSE_TM_CLONE_REGISTRY=0')
Leave blank if you don't know better.
config STATIC_TOOLCHAIN config STATIC_TOOLCHAIN
select CC_GCC_STATIC_LIBSTDCXX if CC_GCC_4_4_or_later select CC_GCC_STATIC_LIBSTDCXX if CC_GCC_4_4_or_later

9
scripts/build/cc/100-gcc.sh
View File

@ -194,6 +194,7 @@ do_gcc_core_backend() {
local -a core_LDFLAGS local -a core_LDFLAGS
local -a core_targets local -a core_targets
local -a extra_user_config local -a extra_user_config
local -a extra_user_env
local arg local arg
for arg in "$@"; do for arg in "$@"; do
@ -391,6 +392,10 @@ do_gcc_core_backend() {
extra_config+=("--disable-multilib") extra_config+=("--disable-multilib")
fi fi
if [ "x${CT_CC_GCC_EXTRA_ENV_ARRAY}" != "x" ]; then
extra_user_env=( "${CT_CC_GCC_EXTRA_ENV_ARRAY[@]}" )
fi
CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'" CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
# Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532) # Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532)
@ -470,7 +475,7 @@ do_gcc_core_backend() {
repair_cc="" repair_cc=""
fi fi
CT_DoExecLog ALL make ${JOBSFLAGS} -C gcc ${libgcc_rule} \ CT_DoExecLog ALL make ${JOBSFLAGS} ${extra_user_env} -C gcc ${libgcc_rule} \
${repair_cc} ${repair_cc}
sed -r -i -e 's@-lc@@g' gcc/${libgcc_rule} sed -r -i -e 's@-lc@@g' gcc/${libgcc_rule}
else # build_libgcc else # build_libgcc
@ -489,7 +494,7 @@ do_gcc_core_backend() {
fi fi
CT_DoLog EXTRA "Building gcc" CT_DoLog EXTRA "Building gcc"
CT_DoExecLog ALL make ${JOBSFLAGS} "${core_targets[@]/#/all-}" CT_DoExecLog ALL make ${JOBSFLAGS} ${extra_user_env} "${core_targets[@]/#/all-}"
CT_DoLog EXTRA "Installing gcc" CT_DoLog EXTRA "Installing gcc"
CT_DoExecLog ALL make ${JOBSFLAGS} "${core_targets[@]/#/install-}" CT_DoExecLog ALL make ${JOBSFLAGS} "${core_targets[@]/#/install-}"