aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Alcock <nick.alcock@oracle.com>2025-07-16 14:43:25 +0100
committerNick Alcock <nick.alcock@oracle.com>2025-08-10 17:50:14 +0100
commit2d50e4512900f2508fe12b47b3619cf227c9e013 (patch)
tree5a19c150acd6fe97c94703c280f30fa7777c95f4
parent208db3b38f84807b10eb757b2bee8f56acf10c18 (diff)
downloadbinutils-2d50e4512900f2508fe12b47b3619cf227c9e013.zip
binutils-2d50e4512900f2508fe12b47b3619cf227c9e013.tar.gz
binutils-2d50e4512900f2508fe12b47b3619cf227c9e013.tar.bz2
libctf: get libctf-nobfd.ver from the right place with Solaris ld
We generate de-commented version scripts for Solaris ld (whose -z gnu-version-script linker option does not support comments), but after we switched to generating libctf-nobfd.ver itself, we failed to adjust this code to pick it up from the new location. libctf/ PR libctf/33161 * configure.ac: Fix libctf-nobfd.ver path on Solaris. * configure: Regenerated. (cherry picked from commit 3ff8956e4bf46ffd638bf12ea4788a858e905023)
-rwxr-xr-xlibctf/configure2
-rw-r--r--libctf/configure.ac2
2 files changed, 2 insertions, 2 deletions
diff --git a/libctf/configure b/libctf/configure
index 4c244da..89c99c2 100755
--- a/libctf/configure
+++ b/libctf/configure
@@ -17023,7 +17023,7 @@ if test -n "$decommented_version_script"; then
# used by GNU ld. Use cpp to strip the comments out. (cpp exists under this
# name on all platforms that support ld -z gnu-version-script.)
/lib/cpp < $srcdir/libctf.ver > libctf-decommented.ver
- /lib/cpp < $srcdir/libctf-nobfd.ver > libctf-nobfd-decommented.ver
+ /lib/cpp < libctf-nobfd.ver > libctf-nobfd-decommented.ver
VERSION_FLAGS="$ac_cv_libctf_version_script='libctf-decommented.ver'"
VERSION_FLAGS_NOBFD="$ac_cv_libctf_version_script='libctf-nobfd-decommented.ver'"
elif test -z "$no_version_script"; then
diff --git a/libctf/configure.ac b/libctf/configure.ac
index dbe311c..40d00e8 100644
--- a/libctf/configure.ac
+++ b/libctf/configure.ac
@@ -301,7 +301,7 @@ if test -n "$decommented_version_script"; then
# used by GNU ld. Use cpp to strip the comments out. (cpp exists under this
# name on all platforms that support ld -z gnu-version-script.)
/lib/cpp < $srcdir/libctf.ver > libctf-decommented.ver
- /lib/cpp < $srcdir/libctf-nobfd.ver > libctf-nobfd-decommented.ver
+ /lib/cpp < libctf-nobfd.ver > libctf-nobfd-decommented.ver
VERSION_FLAGS="$ac_cv_libctf_version_script='libctf-decommented.ver'"
VERSION_FLAGS_NOBFD="$ac_cv_libctf_version_script='libctf-nobfd-decommented.ver'"
elif test -z "$no_version_script"; then