From: Ralf Wildenhues Date: Sun, 20 Nov 2005 12:09:26 +0000 (+0000) Subject: * libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) X-Git-Tag: release-1-5-22~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd17e929268813d59b6c5443de96ad149232fb44;p=thirdparty%2Flibtool.git * libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) (AC_LIBTOOL_LANG_CXX_CONFIG) [aix4/aix5 !ia64]: Set whole_archive_flag_spec to $convenience so the convenience libs are really added to the link cmdline. Missing backport from CVS HEAD 2004-11-17 noted by Jørgen Moth . --- diff --git a/ChangeLog b/ChangeLog index 40feca6ea..cdf797caa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-11-20 Ralf Wildenhues + + * libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) + (AC_LIBTOOL_LANG_CXX_CONFIG) [aix4/aix5 !ia64]: Set + whole_archive_flag_spec to $convenience so the convenience libs + are really added to the link cmdline. + Missing backport from CVS HEAD 2004-11-17 noted by Jørgen Moth + . + 2005-11-20 Todd Vierling , Thorsten Glaser diff --git a/libtool.m4 b/libtool.m4 index 227d2677c..36e10e348 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -2961,7 +2961,7 @@ case $host_os in _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared libraries. _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -5751,7 +5751,7 @@ _LT_EOF _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared libraries. _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'