diff options
| author | Nick Alcock <nick.alcock@oracle.com> | 2021-02-03 18:42:06 +0000 |
|---|---|---|
| committer | Nick Alcock <nick.alcock@oracle.com> | 2021-02-10 15:26:57 +0000 |
| commit | 95148614026da7353721411dd020d024667e3482 (patch) | |
| tree | 39af646d728d6f1c7a7e78d592bb9c56dbed99cb /opcodes/configure.ac | |
| parent | aee224d6434c08a1404a4357cf0a664a4c2f02eb (diff) | |
| download | binutils-gdb-95148614026da7353721411dd020d024667e3482.tar.gz | |
bfd, opcodes, libctf: support --with-included-gettext
Right now, these libraries hardwire -L../intl -lintl on a few fixed
platforms, which works fine on those platforms but on other platforms
leads to shared libraries that lack libintl_* symbols when configured
--with-included-gettext, and/or static libraries that contain libintl as
*another* static library. If we instead use the LIBINTL variable
defined in ../intl/config.intl, this gives us the right thing on all
three classes of platform (gettext in libc, gettext in system libintl,
gettext in ../intl/libintl.a).. This also means we can rip out some
Darwin-specific machinery from configure.ac and also simplify the Cygwin
side.
This also means that the libctf testsuite (and other places that include
libbfd, libopcodes or libctf) don't need to grow libintl dependencies
just on account of those libraries (though they still need such
dependencies if they themselves use gettext machinery).
bfd/ChangeLog
2021-02-03 Nick Alcock <nick.alcock@oracle.com>
* configure.ac (SHARED_LIBADD): Remove explicit -lintl population in
favour of LIBINTL.
* configure: Regenerated.
libctf/ChangeLog
2021-02-02 Nick Alcock <nick.alcock@oracle.com>
* configure.ac (CTF_LIBADD): Remove explicit -lintl population in
favour of LIBINTL.
* Makefile.am (libctf_nobfd_la_LIBADD): No longer explicitly
include $(LIBINTL).
(check-DEJAGNU): Pass down to tests as well.
* configure: Regenerated.
* Makefile.in: Likewise.
opcodes/ChangeLog
2021-02-04 Nick Alcock <nick.alcock@oracle.com>
* configure.ac (SHARED_LIBADD): Remove explicit -lintl population in
favour of LIBINTL.
* configure: Regenerated.
Diffstat (limited to 'opcodes/configure.ac')
| -rw-r--r-- | opcodes/configure.ac | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/opcodes/configure.ac b/opcodes/configure.ac index 21929796fef..c19d2f8c958 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac @@ -166,17 +166,23 @@ if test "$enable_shared" = "yes"; then # Note that linking against libbfd as we do here, which is itself linked # against libiberty, may not satisfy all the libopcodes libiberty references # since libbfd may not pull in the entirety of libiberty. +# Also, jam libintl into the right place in all of this: after libiberty, +# which uses it, but before -lcygwin, which it uses. changequote(,)dnl x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 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 *-*-cygwin*) SHARED_LDFLAGS="-no-undefined" - SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin" + SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty $SHARED_LIBADD" ;; *-*-darwin*) SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.dylib ${SHARED_LIBADD}" |