1.1 --- a/config/cc.in	Tue Dec 23 22:20:25 2008 +0000
     1.2 +++ b/config/cc.in	Wed Dec 24 17:34:32 2008 +0000
     1.3 @@ -28,8 +28,6 @@
     1.4  config CC_SUPPORT_OBJCXX
     1.5      bool
     1.6  
     1.7 -if ! BARE_METAL
     1.8 -
     1.9  comment "Additional supported languages:"
    1.10  
    1.11  config CC_LANG_CXX
    1.12 @@ -43,6 +41,8 @@
    1.13        Only select this if you know that your specific version of the
    1.14        compiler supports this language.
    1.15  
    1.16 +if ! BARE_METAL
    1.17 +
    1.18  config CC_LANG_FORTRAN
    1.19      bool
    1.20      prompt "Fortran"
    1.21 @@ -115,8 +115,4 @@
    1.22  
    1.23  endif # ! BARE_METAL
    1.24  
    1.25 -if BARE_METAL
    1.26 -comment "Only C language supported on bare metal"
    1.27 -endif # BARE_METAL
    1.28 -
    1.29  endmenu

     2.1 --- a/scripts/build/cc/gcc.sh	Tue Dec 23 22:20:25 2008 +0000
     2.2 +++ b/scripts/build/cc/gcc.sh	Wed Dec 24 17:34:32 2008 +0000
     2.3 @@ -72,6 +72,7 @@
     2.4      local build_libgcc
     2.5      local core_prefix_dir
     2.6      local extra_config
     2.7 +    local lang_opt
     2.8  
     2.9      eval $1
    2.10      eval $2
    2.11 @@ -80,10 +81,11 @@
    2.12      # In normal conditions, ( "${mode}" = "shared" ) implies
    2.13      # ( "${build_libgcc}" = "yes" ), but I won't check for that
    2.14  
    2.15 +    CT_DoStep INFO "Installing ${mode} core C compiler"
    2.16      mkdir -p "${CT_BUILD_DIR}/build-cc-core-${mode}"
    2.17      cd "${CT_BUILD_DIR}/build-cc-core-${mode}"
    2.18  
    2.19 -    CT_DoStep INFO "Installing ${mode} core C compiler"
    2.20 +    lang_opt=c
    2.21      case "${mode}" in
    2.22          static)
    2.23              core_prefix_dir="${CT_CC_CORE_STATIC_PREFIX_DIR}"
    2.24 @@ -98,6 +100,7 @@
    2.25          baremetal)
    2.26              core_prefix_dir="${CT_PREFIX_DIR}"
    2.27              extra_config="${extra_config} --with-newlib --enable-threads=no --disable-shared"
    2.28 +            [ "${CT_CC_LANG_CXX}" = "y" ] && lang_opt="${lang_opt},c++"
    2.29              copy_headers=n
    2.30              ;;
    2.31      esac
    2.32 @@ -140,7 +143,7 @@
    2.33          ${extra_config}                             \
    2.34          --disable-nls                               \
    2.35          --enable-symvers=gnu                        \
    2.36 -        --enable-languages=c                        \
    2.37 +        --enable-languages="${lang_opt}"            \
    2.38          --enable-target-optspace                    \
    2.39          ${CT_CC_CORE_EXTRA_CONFIG}
    2.40