From db2872f2acda564162814d54aea6db8bb116cb73 Mon Sep 17 00:00:00 2001 From: Cody Schafer Date: Fri, 9 May 2014 19:13:49 -0700 Subject: cc/gcc: allow CC_EXTRA_CONFIG_ARRAY on baremetal The final bare-metal compiler is built using the core backend. Currently the core uses the CC_CORE_EXTRA_CONFIG_ARRAY variable. While this works as supposed to, this can leave the user puzzled in the menuconfig, since all he can see is the core options, not the final options. Only show the core options if any of the core passes are needed, and use the final options in the core-backend if we're issuing the bare-metal compiler. Signed-off-by: Cody P Schafer [yann.morin.1998@free.fr: hide core options if no core pass needed; use final option in core backend if issuing the bare-metal compiler] Signed-off-by: "Yann E. MORIN" Message-Id: <22181e546ba746202489.1399688067@localhost> Patchwork-Id: 347586 --- scripts/build/cc/gcc.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scripts/build/cc') diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index 29eaabe0..8a428a23 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -188,6 +188,7 @@ do_cc_core_backend() { local -a extra_config local -a core_LDFLAGS local -a core_targets + local -a extra_user_config local arg for arg in "$@"; do @@ -201,17 +202,20 @@ do_cc_core_backend() { extra_config+=("--with-newlib") extra_config+=("--enable-threads=no") extra_config+=("--disable-shared") + extra_user_config=( "${CT_CC_CORE_EXTRA_CONFIG_ARRAY[@]}" ) copy_headers=y # For baremetal, as there's no headers to copy, # we copy an empty directory. So, who cares? ;; shared) extra_config+=("--enable-shared") + extra_user_config=( "${CT_CC_CORE_EXTRA_CONFIG_ARRAY[@]}" ) copy_headers=y ;; baremetal) extra_config+=("--with-newlib") extra_config+=("--enable-threads=no") extra_config+=("--disable-shared") + extra_user_config=( "${CT_CC_EXTRA_CONFIG_ARRAY[@]}" ) copy_headers=n ;; *) @@ -391,7 +395,7 @@ do_cc_core_backend() { ${CC_CORE_SYSROOT_ARG} \ "${extra_config[@]}" \ --enable-languages="${lang_list}" \ - "${CT_CC_CORE_EXTRA_CONFIG_ARRAY[@]}" + "${extra_user_config[@]}" if [ "${build_libgcc}" = "yes" ]; then # HACK: we need to override SHLIB_LC from gcc/config/t-slibgcc-elf-ver or -- cgit v1.2.3