diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2023-02-22 20:05:35 +0100 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2024-08-05 09:14:38 +0200 |
| commit | fc6a20271cb9e0b2db04ad944a08e83e00b8375b (patch) | |
| tree | b481cfd935691b9f1124660efa4859d61aa7d4e9 | |
| parent | Gentoo: XFAIL 15 broken ld.gold tests (diff) | |
| download | binutils-gdb-fc6a20271cb9e0b2db04ad944a08e83e00b8375b.tar.gz binutils-gdb-fc6a20271cb9e0b2db04ad944a08e83e00b8375b.tar.bz2 binutils-gdb-fc6a20271cb9e0b2db04ad944a08e83e00b8375b.zip | |
Apply a similar libiberty fix as in 7d53105d for libopcodes and libgprofnggentoo/binutils-2.43-1
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29042
Bug: https://bugs.gentoo.org/834720
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
| -rw-r--r-- | gprofng/src/Makefile.am | 3 | ||||
| -rw-r--r-- | gprofng/src/Makefile.in | 3 | ||||
| -rwxr-xr-x | opcodes/configure | 4 | ||||
| -rw-r--r-- | opcodes/configure.ac | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am index fb4b8a0fafa..3d7cb18ff71 100644 --- a/gprofng/src/Makefile.am +++ b/gprofng/src/Makefile.am @@ -144,7 +144,8 @@ libgprofng_la_LDFLAGS = -version-info 0:0:0 # Pass -lpthread instead of $(PTHREAD_LIBS) due to $(PTHREAD_LIBS) being empty # when -nostdlib is passed to libtool. # See bug 29364 - libgprofng.so: needs to link against -pthread -libgprofng_la_LIBADD = $(top_builddir)/../opcodes/libopcodes.la \ +libgprofng_la_LIBADD = $(GPROFNG_LIBADD) \ + $(top_builddir)/../opcodes/libopcodes.la \ $(top_builddir)/../bfd/libbfd.la \ $(GPROFNG_LIBADD) \ -lpthread -ldl diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in index cef4b275305..295fd3ee2df 100644 --- a/gprofng/src/Makefile.in +++ b/gprofng/src/Makefile.in @@ -552,7 +552,8 @@ libgprofng_la_LDFLAGS = -version-info 0:0:0 # Pass -lpthread instead of $(PTHREAD_LIBS) due to $(PTHREAD_LIBS) being empty # when -nostdlib is passed to libtool. # See bug 29364 - libgprofng.so: needs to link against -pthread -libgprofng_la_LIBADD = $(top_builddir)/../opcodes/libopcodes.la \ +libgprofng_la_LIBADD = $(GPROFNG_LIBADD) \ + $(top_builddir)/../opcodes/libopcodes.la \ $(top_builddir)/../bfd/libbfd.la \ $(GPROFNG_LIBADD) \ -lpthread -ldl diff --git a/opcodes/configure b/opcodes/configure index 313cbd436ed..2f49433705d 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -14379,10 +14379,10 @@ if test "$enable_shared" = "yes"; then case "${host}" in *-*-cygwin*) SHARED_LDFLAGS="-no-undefined" - SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty $SHARED_LIBADD" + SHARED_LIBADD="$SHARED_LIBADD -L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty $SHARED_LIBADD" ;; *) - SHARED_LIBADD="../bfd/libbfd.la ${SHARED_LIBADD}" + SHARED_LIBADD="${SHARED_LIBADD} ../bfd/libbfd.la ${SHARED_LIBADD}" SHARED_DEPENDENCIES="../bfd/libbfd.la" ;; esac diff --git a/opcodes/configure.ac b/opcodes/configure.ac index 4d918e3ef9b..9692e69693e 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac @@ -195,10 +195,10 @@ if test "$enable_shared" = "yes"; then case "${host}" in *-*-cygwin*) SHARED_LDFLAGS="-no-undefined" - SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty $SHARED_LIBADD" + SHARED_LIBADD="$SHARED_LIBADD -L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty $SHARED_LIBADD" ;; *) - SHARED_LIBADD="../bfd/libbfd.la ${SHARED_LIBADD}" + SHARED_LIBADD="${SHARED_LIBADD} ../bfd/libbfd.la ${SHARED_LIBADD}" SHARED_DEPENDENCIES="../bfd/libbfd.la" ;; esac |