+2020-09-19 Ben Pfaff <blp@cs.stanford.edu>
+ Bruno Haible <bruno@clisp.org>
+
+ 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 <meyering@fb.com>
test-verify.c: avoid -Wshadow warnings
;;
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"
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
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 <https://lekensteyn.nl/rpath.html>.
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