diff options
Diffstat (limited to 'ld/configure.ac')
| -rw-r--r-- | ld/configure.ac | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/ld/configure.ac b/ld/configure.ac index 1ee0c0c..e306c1d 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -28,6 +28,19 @@ AM_INIT_AUTOMAKE AM_SILENT_RULES([yes]) AM_MAINTAINER_MODE +case $target in + *-*-solaris2*) + case "$SHELL" in + *bash*) + ;; + *) + # PR 32580: Force use of bash to avoid corrupt linker scripts. + SHELL=/bin/bash + ;; + esac + ;; +esac + AC_PROG_CC AC_PROG_CXX AC_PROG_GREP @@ -313,7 +326,7 @@ esac], [case "${target}" in # Enable gnu hash only on GNU targets, but not mips mips*-*-*) enable_default_hash_style=sysv ;; - *-*-gnu* | *-*-linux* | *-*-nacl*) enable_default_hash_style=both ;; + *-*-gnu* | *-*-linux*) enable_default_hash_style=both ;; *) enable_default_hash_style=sysv ;; esac]) @@ -389,7 +402,6 @@ fi ALL_LINGUAS="bg da de es fi fr ga id it ja pt_BR ru sr sv tr uk vi zh_CN zh_TW" ZW_GNU_GETTEXT_SISTER_DIR -AM_PO_SUBDIRS AC_EXEEXT @@ -495,11 +507,11 @@ do EMUL=$targ_emul fi - if test x${enable_64_bit_bfd} = xno; then + if test x${have_64_bit_bfd} = xno; then . ${srcdir}/../bfd/config.bfd fi - if test x${enable_64_bit_bfd} = xyes; then + if test x${have_64_bit_bfd} = xyes; then targ_extra_emuls="$targ_extra_emuls $targ64_extra_emuls" targ_extra_libpath="$targ_extra_libpath $targ64_extra_libpath" fi @@ -686,7 +698,7 @@ AC_SUBST(TDIRS) AM_SUBST_NOTMAKE(TDIRS) if test x${all_targets} = xtrue; then - if test x${enable_64_bit_bfd} = xyes; then + if test x${have_64_bit_bfd} = xyes; then EMULATION_OFILES='$(ALL_EMULATIONS) $(ALL_64_EMULATIONS)' EMUL_EXTRA_OFILES='$(ALL_EMUL_EXTRA_OFILES) $(ALL_64_EMUL_EXTRA_OFILES)' else |