ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-02-06 19:09:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

cc/gcc: fix non-MIPS builds

Browse Source 
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:
Yann E. MORIN" 2011-07-03 22:32:36 +02:00
parent 9bc3edf13b
commit 69f9485343
1 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,21 +267,23 @@ do_cc_core() {
*) extra_config+=( "--with-linker-hash-style=${CT_CC_GCC_LNK_HASH_STYLE}" );; *) extra_config+=( "--with-linker-hash-style=${CT_CC_GCC_LNK_HASH_STYLE}" );;
esac esac
case "${CT_ARCH}" in
mips)
case "${CT_CC_GCC_mips_llsc}" in case "${CT_CC_GCC_mips_llsc}" in
y) extra_config+=( --with-llsc );; y) extra_config+=( --with-llsc );;
m) ;; m) ;;
*) extra_config+=( --without-llsc );; *) extra_config+=( --without-llsc );;
esac esac
case "${CT_CC_GCC_mips_synci}" in case "${CT_CC_GCC_mips_synci}" in
y) extra_config+=( --with-synci );; y) extra_config+=( --with-synci );;
m) ;; m) ;;
*) extra_config+=( --without-synci );; *) extra_config+=( --without-synci );;
esac esac
if [ "${CT_CC_GCC_mips_plt}" ]; then if [ "${CT_CC_GCC_mips_plt}" ]; then
extra_config+=( --with-mips-plt ) extra_config+=( --with-mips-plt )
fi fi
;; # ARCH is mips
esac
CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'" CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
@ -560,22 +562,6 @@ do_cc() {
*) extra_config+=( "--with-linker-hash-style=${CT_CC_GCC_LNK_HASH_STYLE}" );; *) extra_config+=( "--with-linker-hash-style=${CT_CC_GCC_LNK_HASH_STYLE}" );;
esac 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 if [ "${CT_CC_GCC_ENABLE_PLUGINS}" = "y" ]; then
extra_config+=( --enable-plugin ) extra_config+=( --enable-plugin )
fi fi
@ -583,6 +569,24 @@ do_cc() {
extra_config+=( --enable-gold ) extra_config+=( --enable-gold )
fi 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[*]}'" CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
# --disable-nls to work around crash bug on ppc405, but also because # --disable-nls to work around crash bug on ppc405, but also because