From 3ff8956e4bf46ffd638bf12ea4788a858e905023 Mon Sep 17 00:00:00 2001 From: Nick Alcock Date: Wed, 16 Jul 2025 14:43:25 +0100 Subject: [PATCH] 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. --- libctf/configure | 2 +- libctf/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libctf/configure b/libctf/configure index 4c244da0100..89c99c2ddbf 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 dbe311c5af3..40d00e8eb18 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 -- 2.47.2