summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBryan Hundven <bryanhundven@gmail.com>2015-10-07 20:32:53 (GMT)
committerBryan Hundven <bryanhundven@gmail.com>2015-10-07 20:32:53 (GMT)
commit9e9b9bd1951bd9609102462f9bcdf0a93e3228d2 (patch)
treed3c08e8070a92485e976e64aef5e2e88d11d61b6 /scripts
parent866bff13071dd43bb2ef5eaf4022ed9bf7522d4a (diff)
parent931248f1aa1cb1edd4b7bdca1b1f725eadea8d6c (diff)
Merge pull request #184 from jasmin-j/add_gcc_env_array
Add additional environment variables for gcc build.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/cc/100-gcc.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh
index 374b038..5d1b1b8 100644
--- a/scripts/build/cc/100-gcc.sh
+++ b/scripts/build/cc/100-gcc.sh
@@ -194,6 +194,7 @@ do_gcc_core_backend() {
local -a core_LDFLAGS
local -a core_targets
local -a extra_user_config
+ local -a extra_user_env
local arg
for arg in "$@"; do
@@ -391,6 +392,10 @@ do_gcc_core_backend() {
extra_config+=("--disable-multilib")
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[*]}'"
# 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=""
fi
- CT_DoExecLog ALL make ${JOBSFLAGS} -C gcc ${libgcc_rule} \
+ CT_DoExecLog ALL make ${JOBSFLAGS} ${extra_user_env} -C gcc ${libgcc_rule} \
${repair_cc}
sed -r -i -e 's@-lc@@g' gcc/${libgcc_rule}
else # build_libgcc
@@ -489,7 +494,7 @@ do_gcc_core_backend() {
fi
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_DoExecLog ALL make ${JOBSFLAGS} "${core_targets[@]/#/install-}"