From 20a8525e8bafb4a66f43bb1486ece439e3e0d95d Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Tue, 23 May 2017 20:54:33 -0700
Subject: Retire CT_CC_GCC_TARGET_FINAL

Make this behavior default in case the core gcc backend is used
for final compiler (i.e., for baremetal configurations). Not
setting this option breaks canadian baremetal configurations,
and not setting it makes little sense at all in any baremetal
configuration (since in baremetal we don't have any libc to begin
with).

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2
index 963cb2a..79a6225 100644
--- a/config/cc/gcc.in.2
+++ b/config/cc/gcc.in.2
@@ -47,17 +47,6 @@ config CC_GCC_MULTILIB_LIST
       for the format of this option for a particular architecture.
       Leave empty to use the default list for this architecture.
 
-config CC_GCC_TARGET_FINAL
-    bool
-    prompt "Use the default targets all and install for the final compiler"
-    default n
-    depends on BARE_METAL
-    help
-      The final GCC for a bare metal system is built by the core gcc script.
-      This script does a lot of tricks to build the core gcc, which are not
-      required for the final gcc build. If you set this flag to true, all the
-      tricks are not done and the compiler is build with all/install.
-
 config STATIC_TOOLCHAIN
     bool
     select CC_GCC_STATIC_LIBSTDCXX
diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh
index 190aec8..c45253a 100644
--- a/scripts/build/cc/100-gcc.sh
+++ b/scripts/build/cc/100-gcc.sh
@@ -337,10 +337,8 @@ do_gcc_core_backend() {
             CT_DoLog EXTRA "Configuring final gcc compiler"
             extra_user_config=( "${CT_CC_GCC_EXTRA_CONFIG_ARRAY[@]}" )
             log_txt="final gcc compiler"
-            if [ "${CT_CC_GCC_TARGET_FINAL}" = "y" ]; then
-                # to inhibit the libiberty and libgcc tricks later on
-                build_libgcc=no
-            fi
+            # to inhibit the libiberty and libgcc tricks later on
+            build_libgcc=no
             ;;
         *)
             CT_Abort "Internal Error: 'build_step' must be one of: 'core1', 'core2', 'gcc_build' or 'gcc_host', not '${build_step:-(empty)}'"
@@ -663,10 +661,8 @@ do_gcc_core_backend() {
 
     case "${build_step}" in
         gcc_build|gcc_host)
-            if [ "${CT_CC_GCC_TARGET_FINAL}" = "y" ]; then
-                core_targets_all=all
-                core_targets_install=install
-            fi
+            core_targets_all=all
+            core_targets_install=install
             ;;
     esac
 
-- 
cgit v0.10.2-6-g49f6