From dc14a69d3390cf349a1eecb2c4d163272f8e9c78 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Tue, 22 Mar 2005 07:40:53 +0000 Subject: [PATCH] =?utf8?q?*=20libtool.m4=20(AC=5FLIBTOOL=5FPROG=5FLD=5FSHL?= =?utf8?q?IBS)=20[solaris]:=20Use=20${wlarc}=20and=20set=20to=20empty=20wh?= =?utf8?q?en=20using=20$LD=20for=20linking.=20=20Fixes=20regression=20intr?= =?utf8?q?oduced=20in=202004-12-20.=20Reported=20by=20Ralf=20Menzel=20=20and=20=D0=9F=D1=83=D1=85=D0=B0?= =?utf8?q?=D0=BB=D1=8C=D1=81=D0=BA=D0=B8=D0=B9=20=D0=AE=D1=80=D0=B8=D0=B9?= =?utf8?q?=20=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B5=D0=B2=D0=B8=D1=87=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- ChangeLog | 13 +++++++++++-- libtool.m4 | 4 +++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f17aaefb2..8f4046148 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-05-22 Ralf Wildenhues + + * libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) [solaris]: Use ${wlarc} + and set to empty when using $LD for linking. Fixes regression + introduced in 2004-12-20. + Reported by Ralf Menzel and + Пухальский Юрий Андреевич . + 2005-05-21 Gary V. Vaughan , Ralf Wildenhues @@ -27,7 +35,8 @@ -Qoption between allextract/defaultextract. The Sun C++ compiler bundles -Qoption arguments so convenience libraries are linked with defaultextract otherwise. - Backport of branch-2-0 patch dated 2004-03-14. + Backport of branch-2-0 patch dated 2004-03-14. Reported by + Пухальский Юрий Андреевич . 2005-03-16 Ralf Wildenhues @@ -2044,7 +2053,7 @@ * libltdl/ltdl.c (foreach_dirinpath): Ensure that filename is '\0' terminated by all code paths. - Reported by Lutz Müller + Reported by Lutz Müller 2002-06-20 Gary V. Vaughan diff --git a/libtool.m4 b/libtool.m4 index 4cc6f45e2..50ba6702a 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -5765,10 +5765,12 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ solaris*) _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' if test "$GCC" = yes; then + wlarc='${wl}' _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else + wlarc='' _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -5778,7 +5780,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="${wlarc}-z ${wlarc}allextract\$convenience ${wlarc}-z ${wlarc}defaultextract" ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; -- 2.47.3