1.1 --- a/scripts/build/cc/gcc.sh	Thu Nov 13 18:22:23 2008 +0000
     1.2 +++ b/scripts/build/cc/gcc.sh	Wed Dec 24 17:34:32 2008 +0000
     1.3 @@ -72,6 +72,7 @@
     1.4      local build_libgcc
     1.5      local core_prefix_dir
     1.6      local extra_config
     1.7 +    local lang_opt
     1.8  
     1.9      eval $1
    1.10      eval $2
    1.11 @@ -80,10 +81,11 @@
    1.12      # In normal conditions, ( "${mode}" = "shared" ) implies
    1.13      # ( "${build_libgcc}" = "yes" ), but I won't check for that
    1.14  
    1.15 +    CT_DoStep INFO "Installing ${mode} core C compiler"
    1.16      mkdir -p "${CT_BUILD_DIR}/build-cc-core-${mode}"
    1.17      cd "${CT_BUILD_DIR}/build-cc-core-${mode}"
    1.18  
    1.19 -    CT_DoStep INFO "Installing ${mode} core C compiler"
    1.20 +    lang_opt=c
    1.21      case "${mode}" in
    1.22          static)
    1.23              core_prefix_dir="${CT_CC_CORE_STATIC_PREFIX_DIR}"
    1.24 @@ -98,6 +100,7 @@
    1.25          baremetal)
    1.26              core_prefix_dir="${CT_PREFIX_DIR}"
    1.27              extra_config="${extra_config} --with-newlib --enable-threads=no --disable-shared"
    1.28 +            [ "${CT_CC_LANG_CXX}" = "y" ] && lang_opt="${lang_opt},c++"
    1.29              copy_headers=n
    1.30              ;;
    1.31      esac
    1.32 @@ -140,7 +143,7 @@
    1.33          ${extra_config}                             \
    1.34          --disable-nls                               \
    1.35          --enable-symvers=gnu                        \
    1.36 -        --enable-languages=c                        \
    1.37 +        --enable-languages="${lang_opt}"            \
    1.38          --enable-target-optspace                    \
    1.39          ${CT_CC_CORE_EXTRA_CONFIG}
    1.40