From dedc81f9d147e2582b64b5887c7284c47e9e37c5 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Tue, 22 Mar 2005 07:40:19 +0000 Subject: [PATCH] =?utf8?q?*=20m4/libtool.m4=20(=5FLT=5FLINKER=5FSHLIBS)=20?= =?utf8?q?[solaris]:=20Use=20${wlarc}=20and=20set=20to=20empty=20when=20us?= =?utf8?q?ing=20$LD=20for=20linking.=20=20Fixes=20regression=20introduced?= =?utf8?q?=20in=202004-11-17.=20Reported=20by=20Ralf=20Menzel=20=20and=20=D0=9F=D1=83=D1=85=D0=B0=D0=BB?= =?utf8?q?=D1=8C=D1=81=D0=BA=D0=B8=D0=B9=20=D0=AE=D1=80=D0=B8=D0=B9=20?= =?utf8?q?=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 | 8 ++++++++ m4/libtool.m4 | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0198798d7..0689d74de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-05-22 Ralf Wildenhues + + * m4/libtool.m4 (_LT_LINKER_SHLIBS) [solaris]: Use ${wlarc} + and set to empty when using $LD for linking. Fixes regression + introduced in 2004-11-17. + Reported by Ralf Menzel and + Пухальский Юрий Андреевич . + 2005-05-21 Gary V. Vaughan , Ralf Wildenhues diff --git a/m4/libtool.m4 b/m4/libtool.m4 index f7b0c785e..31cedc385 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -4215,17 +4215,20 @@ _LT_EOF solaris*) _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' if test "$GCC" = yes; then + wlarc='${wl}' _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _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 ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) + wlarc='' _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_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' ;; *) + wlarc='${wl}' _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' _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${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' @@ -4237,7 +4240,7 @@ _LT_EOF case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; + _LT_TAGVAR(whole_archive_flag_spec, $1)="${wlarc}-z ${wlarc}allextract\$convenience ${wlarc}-z ${wlarc}defaultextract" ;; esac _LT_TAGVAR(link_all_deplibs, $1)=yes ;; -- 2.47.2