From 1b53d13b2b8a46606dd2e50a44dc509c8677eb57 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 20 Sep 2020 16:44:29 +0200 Subject: [PATCH] relocatable-prog: Fix for multiple relocatable library directories. * build-aux/reloc-ldflags: Fix handling of multiple relocatable library directories. Each one needs its own -Wl,-rpath,$dir option, instead of being attached to a single one. --- ChangeLog | 8 ++++++++ build-aux/reloc-ldflags | 15 ++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 541f5d7a44..d2ba0c62d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2020-09-19 Ben Pfaff + Bruno Haible + + relocatable-prog: Fix for multiple relocatable library directories. + * build-aux/reloc-ldflags: Fix handling of multiple relocatable library + directories. Each one needs its own -Wl,-rpath,$dir option, instead of + being attached to a single one. + 2020-09-19 Jim Meyering test-verify.c: avoid -Wshadow warnings diff --git a/build-aux/reloc-ldflags b/build-aux/reloc-ldflags index 145e741f8f..cdb2f47bda 100755 --- a/build-aux/reloc-ldflags +++ b/build-aux/reloc-ldflags @@ -68,7 +68,9 @@ case "$host_os" in ;; esac if test -n "$origin_token"; then - rpath= + # We are not on AIX, HP-UX, or IRIX. Therefore the -rpath options are + # cumulative. + rpath_options= save_IFS="$IFS"; IFS=":" for dir in $library_path_value; do IFS="$save_IFS" @@ -89,8 +91,8 @@ if test -n "$origin_token"; then idir=`echo "$idir" | sed -e 's,^//*[^/]*,,'` done dir="$origin_token"`echo "$idir" | sed -e 's,//*[^/]*,/..,g'`"$dir" - # Add dir to rpath. - rpath="${rpath}${rpath:+ }$dir" + # Augment rpath_options with dir. + rpath_options="${rpath_options}${rpath_options:+ }-Wl,-rpath,$dir" ;; *) if test -n "$dir"; then @@ -101,15 +103,14 @@ if test -n "$origin_token"; then done IFS="$save_IFS" # Output it. - if test -n "$rpath"; then + if test -n "$rpath_options"; then case "$host_os" in # At least some versions of FreeBSD, DragonFly, and OpenBSD need the # linker option "-z origin". See . freebsd* | dragonfly* | openbsd*) - echo "-Wl,-z,origin -Wl,-rpath,$rpath" ;; - *) - echo "-Wl,-rpath,$rpath" ;; + rpath_options="-Wl,-z,origin $rpath_options" ;; esac + echo "$rpath_options" fi else echo "relocation via rpath not supported on this system: $host" 1>&2 -- 2.39.5