1.1 --- a/scripts/build/cc/gcc.sh	Mon Jul 25 19:04:17 2011 +0200
     1.2 +++ b/scripts/build/cc/gcc.sh	Mon Aug 15 21:42:28 2011 +0200
     1.3 @@ -53,6 +53,24 @@
     1.4  }
     1.5  
     1.6  #------------------------------------------------------------------------------
     1.7 +# This function builds up the set of languages to enable
     1.8 +# No argument expected, returns the comma-separated language list on stdout
     1.9 +cc_gcc_lang_list() {
    1.10 +    local lang_list
    1.11 +
    1.12 +    lang_list="c"
    1.13 +    [ "${CT_CC_LANG_CXX}" = "y"      ] && lang_list+=",c++"
    1.14 +    [ "${CT_CC_LANG_FORTRAN}" = "y"  ] && lang_list+=",fortran"
    1.15 +    [ "${CT_CC_LANG_ADA}" = "y"      ] && lang_list+=",ada"
    1.16 +    [ "${CT_CC_LANG_JAVA}" = "y"     ] && lang_list+=",java"
    1.17 +    [ "${CT_CC_LANG_OBJC}" = "y"     ] && lang_list+=",objc"
    1.18 +    [ "${CT_CC_LANG_OBJCXX}" = "y"   ] && lang_list+=",obj-c++"
    1.19 +    lang_list+="${CT_CC_LANG_OTHERS:+,${CT_CC_LANG_OTHERS}}"
    1.20 +
    1.21 +    printf "%s" "${lang_list}"
    1.22 +}
    1.23 +
    1.24 +#------------------------------------------------------------------------------
    1.25  # Core gcc pass 1
    1.26  do_cc_core_pass_1() {
    1.27      local -a core_opts
    1.28 @@ -523,20 +541,8 @@
    1.29      CT_DoLog EXTRA "Configuring final compiler"
    1.30  
    1.31      # Enable selected languages
    1.32 -    lang_opt="c"
    1.33 -    [ "${CT_CC_LANG_CXX}" = "y"      ] && lang_opt="${lang_opt},c++"
    1.34 -    [ "${CT_CC_LANG_FORTRAN}" = "y"  ] && lang_opt="${lang_opt},fortran"
    1.35 -    [ "${CT_CC_LANG_ADA}" = "y"      ] && lang_opt="${lang_opt},ada"
    1.36 -    [ "${CT_CC_LANG_JAVA}" = "y"     ] && lang_opt="${lang_opt},java"
    1.37 -    [ "${CT_CC_LANG_OBJC}" = "y"     ] && lang_opt="${lang_opt},objc"
    1.38 -    [ "${CT_CC_LANG_OBJCXX}" = "y"   ] && lang_opt="${lang_opt},obj-c++"
    1.39 -    CT_Test "Building ADA language is not yet supported. Will try..." "${CT_CC_LANG_ADA}" = "y"
    1.40 -    CT_Test "Building Objective-C language is not yet supported. Will try..." "${CT_CC_LANG_OBJC}" = "y"
    1.41 -    CT_Test "Building Objective-C++ language is not yet supported. Will try..." "${CT_CC_LANG_OBJCXX}" = "y"
    1.42 -    CT_Test "Building ${CT_CC_LANG_OTHERS//,/ } language(s) is not yet supported. Will try..." -n "${CT_CC_LANG_OTHERS}"
    1.43 -    lang_opt=$(echo "${lang_opt},${CT_CC_LANG_OTHERS}" |sed -r -e 's/,+/,/g; s/,*$//;')
    1.44 +    extra_config+=("--enable-languages=$( cc_gcc_lang_list )")
    1.45  
    1.46 -    extra_config+=("--enable-languages=${lang_opt}")
    1.47      for tmp in ARCH ABI CPU TUNE FPU FLOAT; do
    1.48          eval tmp="\${CT_ARCH_WITH_${tmp}}"
    1.49          if [ -n "${tmp}" ]; then