From 204b94605020eb347f92e825734ddf7f756a1ddb Mon Sep 17 00:00:00 2001 From: Richard Palo Date: Wed, 19 Dec 2012 11:08:15 +0100 Subject: [PATCH] libtool: Add SONAME to the so when exporting explicit symbols on Solaris m4/libtool.m (_LT_LANG_CXX_CONFIG) [Solaris] : Feed -h $soname to the linker just as is done in archive_cmds. THANKS: Update. Copyright-paperwork-exempt: Yes Signed-off-by: Peter Rosin --- THANKS | 1 + m4/libtool.m4 | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/THANKS b/THANKS index ef617e4a..1259cbf2 100644 --- a/THANKS +++ b/THANKS @@ -165,6 +165,7 @@ Rainer Tammer tammer@tammer.net Ralf Menzel menzel@ls6.cs.uni-dortmund.de Richard B. Kreckel kreckel@ginac.de + Richard Palo richard.palo@baou.fr Richard Purdie rpurdie@rpsys.net Richard Sandiford richards@transitive.com Robert Garron Robert.Garron@Access3000.net diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 3cf14e7f..205b1e34 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -6757,7 +6757,7 @@ if test yes != "$_lt_caught_CXX_error"; then if $CC --version | $GREP -v '^2\.7' > /dev/null; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -6768,7 +6768,7 @@ if test yes != "$_lt_caught_CXX_error"; then # platform. _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib $wl-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when