# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1313441571 -7200
# Node ID be5d4773a8944882e443789beee01f9bca1426bc
# Parent  c1f65d6a9a132893f2a2ab700976c811959d4e46
cc/gcc: pass the language list to the core backend

As the core backend can be used to also build the bare-metal compiler,
we have to tel it what languages to build.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff -r c1f65d6a9a13 -r be5d4773a894 scripts/build/cc/gcc.sh
--- a/scripts/build/cc/gcc.sh	Mon Aug 15 21:42:28 2011 +0200
+++ b/scripts/build/cc/gcc.sh	Mon Aug 15 22:52:51 2011 +0200
@@ -89,6 +89,7 @@
             core_opts+=( "complibs=${CT_BUILDTOOLS_PREFIX_DIR}" )
             core_opts+=( "prefix=${CT_BUILDTOOLS_PREFIX_DIR}" )
             core_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
+            core_opts+=( "lang_list=c" )
             ;;
     esac
 
@@ -113,6 +114,7 @@
     core_opts+=( "prefix=${CT_BUILDTOOLS_PREFIX_DIR}" )
     core_opts+=( "complibs=${CT_BUILDTOOLS_PREFIX_DIR}" )
     core_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
+    core_opts+=( "lang_list=c" )
 
     # Do nothing for canadian-crosses, we already have a target compiler.
     # Different conditions are at stake here:
@@ -162,6 +164,7 @@
 #   host                : the machine the core will run on          : tuple     : (none)
 #   prefix              : dir prefix to install into                : dir       : (none)
 #   complibs            : dir where complibs are isntalled          : dir       : (none)
+#   lang_list           : the list of languages to build            : string    : (empty)
 #   build_libgcc        : build libgcc or not                       : bool      : no
 #   build_libstdcxx     : build libstdc++ or not                    : bool      : no
 #   build_staticlinked  : build statically linked or not            : bool      : no
@@ -177,7 +180,7 @@
     local host
     local prefix
     local complibs
-    local lang_opt
+    local lang_list
     local cflags
     local tmp
     local -a host_libstdcxx_flags
@@ -192,7 +195,6 @@
 
     CT_DoLog EXTRA "Configuring core C compiler"
 
-    lang_opt=c
     case "${mode}" in
         static)
             extra_config+=("--with-newlib")
@@ -209,7 +211,6 @@
             extra_config+=("--with-newlib")
             extra_config+=("--enable-threads=no")
             extra_config+=("--disable-shared")
-            [ "${CT_CC_LANG_CXX}" = "y" ] && lang_opt="${lang_opt},c++"
             copy_headers=n
             ;;
         *)
@@ -374,7 +375,7 @@
         --disable-libmudflap                        \
         ${CC_CORE_SYSROOT_ARG}                      \
         "${extra_config[@]}"                        \
-        --enable-languages="${lang_opt}"            \
+        --enable-languages="${lang_list}"           \
         "${CT_CC_CORE_EXTRA_CONFIG_ARRAY[@]}"
 
     if [ "${build_libgcc}" = "yes" ]; then
@@ -496,6 +497,7 @@
         final_opts+=( "mode=baremetal" )
         final_opts+=( "build_libgcc=yes" )
         final_opts+=( "build_libstdcxx=yes" )
+        final_opts+=( "lang_list=$( cc_gcc_lang_list )" )
         if [ "${CT_STATIC_TOOLCHAIN}" = "y" ]; then
             final_opts+=( "build_staticlinked=yes" )
         fi