summaryrefslogtreecommitdiff
path: root/scripts/build/cc
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@free.fr>2012-08-01 17:07:37 (GMT)
committerYann E. MORIN" <yann.morin.1998@free.fr>2012-08-01 17:07:37 (GMT)
commitc74fa76e4d4594c199a726362b43d46555c92b7c (patch)
tree2fb7e4fd533dfcf662e10bc3a14c7d94d2c9a8fc /scripts/build/cc
parent9d64a6b29e7dbbcfe393da56bdc2defc010a71f4 (diff)
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>
Diffstat (limited to 'scripts/build/cc')
-rw-r--r--scripts/build/cc/gcc.sh31
1 files changed, 10 insertions, 21 deletions
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index 99d6121..707a426 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -74,13 +74,11 @@ cc_gcc_lang_list() {
# 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 @@ do_cc_core_pass_1() {
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 @@ do_cc_core_pass_1() {
;;
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 @@ do_cc_core_pass_2() {
# 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 @@ do_cc_core_pass_2() {
;;
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
}
#------------------------------------------------------------------------------