mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-01-18 02:39:46 +00:00
cc/gcc: fix non-MIPS builds
The new MIPS-specific options are not valid for other targets. Also, move the arch-specific setting lower in the extra_config setting. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
This commit is contained in:
parent
9bc3edf13b
commit
69f9485343
@ -267,22 +267,24 @@ do_cc_core() {
|
||||
*) extra_config+=( "--with-linker-hash-style=${CT_CC_GCC_LNK_HASH_STYLE}" );;
|
||||
esac
|
||||
|
||||
case "${CT_CC_GCC_mips_llsc}" in
|
||||
y) extra_config+=( --with-llsc );;
|
||||
m) ;;
|
||||
*) extra_config+=( --without-llsc );;
|
||||
case "${CT_ARCH}" in
|
||||
mips)
|
||||
case "${CT_CC_GCC_mips_llsc}" in
|
||||
y) extra_config+=( --with-llsc );;
|
||||
m) ;;
|
||||
*) extra_config+=( --without-llsc );;
|
||||
esac
|
||||
case "${CT_CC_GCC_mips_synci}" in
|
||||
y) extra_config+=( --with-synci );;
|
||||
m) ;;
|
||||
*) extra_config+=( --without-synci );;
|
||||
esac
|
||||
if [ "${CT_CC_GCC_mips_plt}" ]; then
|
||||
extra_config+=( --with-mips-plt )
|
||||
fi
|
||||
;; # ARCH is mips
|
||||
esac
|
||||
|
||||
case "${CT_CC_GCC_mips_synci}" in
|
||||
y) extra_config+=( --with-synci );;
|
||||
m) ;;
|
||||
*) extra_config+=( --without-synci );;
|
||||
esac
|
||||
|
||||
if [ "${CT_CC_GCC_mips_plt}" ]; then
|
||||
extra_config+=( --with-mips-plt )
|
||||
fi
|
||||
|
||||
CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
|
||||
|
||||
# Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532)
|
||||
@ -560,22 +562,6 @@ do_cc() {
|
||||
*) extra_config+=( "--with-linker-hash-style=${CT_CC_GCC_LNK_HASH_STYLE}" );;
|
||||
esac
|
||||
|
||||
case "${CT_CC_GCC_mips_llsc}" in
|
||||
y) extra_config+=( --with-llsc );;
|
||||
m) ;;
|
||||
*) extra_config+=( --without-llsc );;
|
||||
esac
|
||||
|
||||
case "${CT_CC_GCC_mips_synci}" in
|
||||
y) extra_config+=( --with-synci );;
|
||||
m) ;;
|
||||
*) extra_config+=( --without-synci );;
|
||||
esac
|
||||
|
||||
if [ "${CT_CC_GCC_mips_plt}" ]; then
|
||||
extra_config+=( --with-mips-plt )
|
||||
fi
|
||||
|
||||
if [ "${CT_CC_GCC_ENABLE_PLUGINS}" = "y" ]; then
|
||||
extra_config+=( --enable-plugin )
|
||||
fi
|
||||
@ -583,6 +569,24 @@ do_cc() {
|
||||
extra_config+=( --enable-gold )
|
||||
fi
|
||||
|
||||
case "${CT_ARCH}" in
|
||||
mips)
|
||||
case "${CT_CC_GCC_mips_llsc}" in
|
||||
y) extra_config+=( --with-llsc );;
|
||||
m) ;;
|
||||
*) extra_config+=( --without-llsc );;
|
||||
esac
|
||||
case "${CT_CC_GCC_mips_synci}" in
|
||||
y) extra_config+=( --with-synci );;
|
||||
m) ;;
|
||||
*) extra_config+=( --without-synci );;
|
||||
esac
|
||||
if [ "${CT_CC_GCC_mips_plt}" ]; then
|
||||
extra_config+=( --with-mips-plt )
|
||||
fi
|
||||
;; # ARCH is mips
|
||||
esac
|
||||
|
||||
CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
|
||||
|
||||
# --disable-nls to work around crash bug on ppc405, but also because
|
||||
|
Loading…
Reference in New Issue
Block a user