ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-05-08 11:58:15 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

cc/gcc: remove now useless condition-variable

Browse Source 
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>
This commit is contained in:
Yann E. MORIN" 2012-08-01 19:07:37 +02:00
parent 9d64a6b29e
commit c74fa76e4d
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
scripts/build/cc/gcc.sh
View File

@ -74,13 +74,11 @@ cc_gcc_lang_list() {
# Core gcc pass 1 # Core gcc pass 1
do_cc_core_pass_1() { do_cc_core_pass_1() {
local -a core_opts local -a core_opts
local do_core
# We only need a pass-1 core gcc if the threading model is NPTL. # We only need a pass-1 core gcc if the threading model is NPTL.
# For all other cases, it is not used. # For all other cases, it is not used.
case "${CT_THREADS}" in case "${CT_THREADS}" in
nptl) nptl)
do_core=y
core_opts+=( "mode=static" ) core_opts+=( "mode=static" )
core_opts+=( "host=${CT_BUILD}" ) core_opts+=( "host=${CT_BUILD}" )
core_opts+=( "complibs=${CT_BUILDTOOLS_PREFIX_DIR}" ) core_opts+=( "complibs=${CT_BUILDTOOLS_PREFIX_DIR}" )
@ -89,7 +87,6 @@ do_cc_core_pass_1() {
core_opts+=( "lang_list=c" ) core_opts+=( "lang_list=c" )
;; ;;
*) *)
do_core=y
core_opts+=( "mode=static" ) core_opts+=( "mode=static" )
core_opts+=( "host=${CT_BUILD}" ) core_opts+=( "host=${CT_BUILD}" )
core_opts+=( "complibs=${CT_BUILDTOOLS_PREFIX_DIR}" ) core_opts+=( "complibs=${CT_BUILDTOOLS_PREFIX_DIR}" )
@ -99,21 +96,18 @@ do_cc_core_pass_1() {
;; ;;
esac esac
if [ "${do_core}" = "y" ]; then CT_DoStep INFO "Installing pass-1 core C compiler"
CT_DoStep INFO "Installing pass-1 core C compiler" CT_mkdir_pushd "${CT_BUILD_DIR}/build-cc-core-pass-1"
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_Popd
CT_EndStep CT_EndStep
fi
} }
# Core gcc pass 2 # Core gcc pass 2
do_cc_core_pass_2() { do_cc_core_pass_2() {
local -a core_opts local -a core_opts
local do_core
# Common options: # Common options:
core_opts+=( "host=${CT_BUILD}" ) core_opts+=( "host=${CT_BUILD}" )
@ -129,17 +123,14 @@ do_cc_core_pass_2() {
# later, we need to build libgcc # later, we need to build libgcc
case "${CT_THREADS}" in case "${CT_THREADS}" in
nptl) nptl)
do_core=y
core_opts+=( "mode=shared" ) core_opts+=( "mode=shared" )
core_opts+=( "build_libgcc=yes" ) core_opts+=( "build_libgcc=yes" )
;; ;;
win32) win32)
do_core=y
core_opts+=( "mode=static" ) core_opts+=( "mode=static" )
core_opts+=( "build_libgcc=yes" ) core_opts+=( "build_libgcc=yes" )
;; ;;
*) *)
do_core=y
core_opts+=( "mode=static" ) core_opts+=( "mode=static" )
if [ "${CT_CC_GCC_4_3_or_later}" = "y" ]; then if [ "${CT_CC_GCC_4_3_or_later}" = "y" ]; then
core_opts+=( "build_libgcc=yes" ) core_opts+=( "build_libgcc=yes" )
@ -147,15 +138,13 @@ do_cc_core_pass_2() {
;; ;;
esac esac
if [ "${do_core}" = "y" ]; then CT_DoStep INFO "Installing pass-2 core C compiler"
CT_DoStep INFO "Installing pass-2 core C compiler" CT_mkdir_pushd "${CT_BUILD_DIR}/build-cc-core-pass-2"
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_Popd
CT_EndStep CT_EndStep
fi
} }
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------