1.1 --- a/scripts/build/cc/gcc.sh	Wed Aug 01 19:02:06 2012 +0200
     1.2 +++ b/scripts/build/cc/gcc.sh	Wed Aug 01 19:07:37 2012 +0200
     1.3 @@ -74,13 +74,11 @@
     1.4  # Core gcc pass 1
     1.5  do_cc_core_pass_1() {
     1.6      local -a core_opts
     1.7 -    local do_core
     1.8  
     1.9      # We only need a pass-1 core gcc if the threading model is NPTL.
    1.10      # For all other cases, it is not used.
    1.11      case "${CT_THREADS}" in
    1.12          nptl)
    1.13 -            do_core=y
    1.14              core_opts+=( "mode=static" )
    1.15              core_opts+=( "host=${CT_BUILD}" )
    1.16              core_opts+=( "complibs=${CT_BUILDTOOLS_PREFIX_DIR}" )
    1.17 @@ -89,7 +87,6 @@
    1.18              core_opts+=( "lang_list=c" )
    1.19              ;;
    1.20          *)
    1.21 -            do_core=y
    1.22              core_opts+=( "mode=static" )
    1.23              core_opts+=( "host=${CT_BUILD}" )
    1.24              core_opts+=( "complibs=${CT_BUILDTOOLS_PREFIX_DIR}" )
    1.25 @@ -99,21 +96,18 @@
    1.26              ;;
    1.27      esac
    1.28  
    1.29 -    if [ "${do_core}" = "y" ]; then
    1.30 -        CT_DoStep INFO "Installing pass-1 core C compiler"
    1.31 -        CT_mkdir_pushd "${CT_BUILD_DIR}/build-cc-core-pass-1"
    1.32 +    CT_DoStep INFO "Installing pass-1 core C compiler"
    1.33 +    CT_mkdir_pushd "${CT_BUILD_DIR}/build-cc-core-pass-1"
    1.34  
    1.35 -        do_cc_core_backend "${core_opts[@]}"
    1.36 +    do_cc_core_backend "${core_opts[@]}"
    1.37  
    1.38 -        CT_Popd
    1.39 -        CT_EndStep
    1.40 -    fi
    1.41 +    CT_Popd
    1.42 +    CT_EndStep
    1.43  }
    1.44  
    1.45  # Core gcc pass 2
    1.46  do_cc_core_pass_2() {
    1.47      local -a core_opts
    1.48 -    local do_core
    1.49  
    1.50      # Common options:
    1.51      core_opts+=( "host=${CT_BUILD}" )
    1.52 @@ -129,17 +123,14 @@
    1.53      #     later, we need to build libgcc
    1.54      case "${CT_THREADS}" in
    1.55          nptl)
    1.56 -            do_core=y
    1.57              core_opts+=( "mode=shared" )
    1.58              core_opts+=( "build_libgcc=yes" )
    1.59              ;;
    1.60          win32)
    1.61 -            do_core=y
    1.62              core_opts+=( "mode=static" )
    1.63              core_opts+=( "build_libgcc=yes" )
    1.64              ;;
    1.65          *)
    1.66 -            do_core=y
    1.67              core_opts+=( "mode=static" )
    1.68              if [ "${CT_CC_GCC_4_3_or_later}" = "y" ]; then
    1.69                  core_opts+=( "build_libgcc=yes" )
    1.70 @@ -147,15 +138,13 @@
    1.71              ;;
    1.72      esac
    1.73  
    1.74 -    if [ "${do_core}" = "y" ]; then
    1.75 -        CT_DoStep INFO "Installing pass-2 core C compiler"
    1.76 -        CT_mkdir_pushd "${CT_BUILD_DIR}/build-cc-core-pass-2"
    1.77 +    CT_DoStep INFO "Installing pass-2 core C compiler"
    1.78 +    CT_mkdir_pushd "${CT_BUILD_DIR}/build-cc-core-pass-2"
    1.79  
    1.80 -        do_cc_core_backend "${core_opts[@]}"
    1.81 +    do_cc_core_backend "${core_opts[@]}"
    1.82  
    1.83 -        CT_Popd
    1.84 -        CT_EndStep
    1.85 -    fi
    1.86 +    CT_Popd
    1.87 +    CT_EndStep
    1.88  }
    1.89  
    1.90  #------------------------------------------------------------------------------