From 225b96ebc862ffe1d5972085d59208b1b49339bf Mon Sep 17 00:00:00 2001 From: Bryan Hundven Date: Wed, 6 Jan 2016 11:07:06 -0800 Subject: gcc: remove CC_GCC_EXTRA_ENV_ARRAY I was noticing that $extra_user_env was inconsistently used in 100-gcc.sh. I don't feel comfortable having just any make flag or environment variable passed to make from a config file. If a specific option needs to be passed to make for gcc, then a specific kconfig option should be added for that make flag/option/env. Signed-off-by: Bryan Hundven --- scripts/build/cc/100-gcc.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'scripts/build') diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh index ed9d190a..a54f6f93 100644 --- a/scripts/build/cc/100-gcc.sh +++ b/scripts/build/cc/100-gcc.sh @@ -200,7 +200,6 @@ do_gcc_core_backend() { local -a core_targets_all local -a core_targets_install local -a extra_user_config - local -a extra_user_env local arg for arg in "$@"; do @@ -407,10 +406,6 @@ 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[*]}'" # Clang's default bracket-depth is 256, and building GCC @@ -488,7 +483,7 @@ do_gcc_core_backend() { repair_cc="" fi - CT_DoExecLog ALL ${make} ${JOBSFLAGS} ${extra_user_env} -C gcc ${libgcc_rule} \ + CT_DoExecLog ALL ${make} ${JOBSFLAGS} -C gcc ${libgcc_rule} \ ${repair_cc} ${sed} -r -i -e 's@-lc@@g' gcc/${libgcc_rule} else # build_libgcc @@ -519,10 +514,10 @@ do_gcc_core_backend() { esac CT_DoLog EXTRA "Building ${log_txt}" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} ${extra_user_env} ${core_targets_all} + CT_DoExecLog ALL ${make} ${JOBSFLAGS} ${core_targets_all} CT_DoLog EXTRA "Installing ${log_txt}" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} ${extra_user_env} ${core_targets_install} + CT_DoExecLog ALL ${make} ${JOBSFLAGS} ${core_targets_install} # Remove the libtool "pseudo-libraries": having them in the installed # tree makes the libtoolized utilities that are built next assume -- cgit v1.2.3