mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-19 04:47:52 +00:00
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>
This commit is contained in:
parent
9d64a6b29e
commit
c74fa76e4d
@ -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,7 +96,6 @@ 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"
|
||||
|
||||
@ -107,13 +103,11 @@ do_cc_core_pass_1() {
|
||||
|
||||
CT_Popd
|
||||
CT_EndStep
|
||||
fi
|
||||
}
|
||||
|
||||
# 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,7 +138,6 @@ 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"
|
||||
|
||||
@ -155,7 +145,6 @@ do_cc_core_pass_2() {
|
||||
|
||||
CT_Popd
|
||||
CT_EndStep
|
||||
fi
|
||||
}
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user