# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@free.fr>
# Date 1343840857 -7200
# Node ID 567565640fbec1d27ce6775ea607c83dc55d58dc
# Parent  c71635732a59345f575ecd410a7ab3091a12b18d
cc/gcc: remove now useless condition-variable

Both core pass-1 and -2 compilers are unconditionally built,
so we no longer require a condition variable.

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

diff -r c71635732a59 -r 567565640fbe scripts/build/cc/gcc.sh
--- a/scripts/build/cc/gcc.sh	Wed Aug 01 19:02:06 2012 +0200
+++ b/scripts/build/cc/gcc.sh	Wed Aug 01 19:07:37 2012 +0200
@@ -74,13 +74,11 @@
 # Core gcc pass 1
 do_cc_core_pass_1() {
     local -a core_opts
-    local do_core
 
     # We only need a pass-1 core gcc if the threading model is NPTL.
     # For all other cases, it is not used.
     case "${CT_THREADS}" in
         nptl)
-            do_core=y
             core_opts+=( "mode=static" )
             core_opts+=( "host=${CT_BUILD}" )
             core_opts+=( "complibs=${CT_BUILDTOOLS_PREFIX_DIR}" )
@@ -89,7 +87,6 @@
             core_opts+=( "lang_list=c" )
             ;;
         *)
-            do_core=y
             core_opts+=( "mode=static" )
             core_opts+=( "host=${CT_BUILD}" )
             core_opts+=( "complibs=${CT_BUILDTOOLS_PREFIX_DIR}" )
@@ -99,21 +96,18 @@
             ;;
     esac
 
-    if [ "${do_core}" = "y" ]; then
-        CT_DoStep INFO "Installing pass-1 core C compiler"
-        CT_mkdir_pushd "${CT_BUILD_DIR}/build-cc-core-pass-1"
+    CT_DoStep INFO "Installing pass-1 core C compiler"
+    CT_mkdir_pushd "${CT_BUILD_DIR}/build-cc-core-pass-1"
 
-        do_cc_core_backend "${core_opts[@]}"
+    do_cc_core_backend "${core_opts[@]}"
 
-        CT_Popd
-        CT_EndStep
-    fi
+    CT_Popd
+    CT_EndStep
 }
 
 # Core gcc pass 2
 do_cc_core_pass_2() {
     local -a core_opts
-    local do_core
 
     # Common options:
     core_opts+=( "host=${CT_BUILD}" )
@@ -129,17 +123,14 @@
     #     later, we need to build libgcc
     case "${CT_THREADS}" in
         nptl)
-            do_core=y
             core_opts+=( "mode=shared" )
             core_opts+=( "build_libgcc=yes" )
             ;;
         win32)
-            do_core=y
             core_opts+=( "mode=static" )
             core_opts+=( "build_libgcc=yes" )
             ;;
         *)
-            do_core=y
             core_opts+=( "mode=static" )
             if [ "${CT_CC_GCC_4_3_or_later}" = "y" ]; then
                 core_opts+=( "build_libgcc=yes" )
@@ -147,15 +138,13 @@
             ;;
     esac
 
-    if [ "${do_core}" = "y" ]; then
-        CT_DoStep INFO "Installing pass-2 core C compiler"
-        CT_mkdir_pushd "${CT_BUILD_DIR}/build-cc-core-pass-2"
+    CT_DoStep INFO "Installing pass-2 core C compiler"
+    CT_mkdir_pushd "${CT_BUILD_DIR}/build-cc-core-pass-2"
 
-        do_cc_core_backend "${core_opts[@]}"
+    do_cc_core_backend "${core_opts[@]}"
 
-        CT_Popd
-        CT_EndStep
-    fi
+    CT_Popd
+    CT_EndStep
 }
 
 #------------------------------------------------------------------------------