diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rwxr-xr-x | bfd/configure | 11 | ||||
| -rw-r--r-- | bfd/configure.ac | 11 |
3 files changed, 16 insertions, 12 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 08e6790..ebe2b58 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2021-02-03 Nick Alcock <nick.alcock@oracle.com> + + * configure.ac (SHARED_LIBADD): Remove explicit -lintl population in + favour of LIBINTL. + * configure: Regenerated. + 2021-02-09 Alan Modra <amodra@gmail.com> * config.bfd (arm*-*-symbianelf*): Move from obsolete to removed. diff --git a/bfd/configure b/bfd/configure index 5a7e88e..accd39c 100755 --- a/bfd/configure +++ b/bfd/configure @@ -14632,17 +14632,16 @@ if test "$enable_shared" = "yes"; then if test -n "$x"; then SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" fi +fi + +SHARED_LIBADD="$SHARED_LIBADD $LIBINTL" +if test "$enable_shared" = "yes"; then case "${host}" in # More hacks to build DLLs on Windows. *-*-cygwin*) SHARED_LDFLAGS="-no-undefined" - SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32" - ;; - - # Use built-in libintl on macOS, since it is not provided by libc. - *-*-darwin*) - SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl" + SHARED_LIBADD="-L`pwd`/../libiberty -liberty $SHARED_LIBADD -lcygwin -lkernel32" ;; esac diff --git a/bfd/configure.ac b/bfd/configure.ac index fae4ea2..e9a07b8 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac @@ -317,17 +317,16 @@ changequote([,])dnl if test -n "$x"; then SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" fi +fi + +SHARED_LIBADD="$SHARED_LIBADD $LIBINTL" +if test "$enable_shared" = "yes"; then case "${host}" in # More hacks to build DLLs on Windows. *-*-cygwin*) SHARED_LDFLAGS="-no-undefined" - SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32" - ;; - - # Use built-in libintl on macOS, since it is not provided by libc. - *-*-darwin*) - SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl" + SHARED_LIBADD="-L`pwd`/../libiberty -liberty $SHARED_LIBADD -lcygwin -lkernel32" ;; esac |