From: Geoffrey Keating <geoffk@apple.com>
Date: Mon, 2 Aug 2004 04:02:04 +0000 (+0000)
Subject: * m4/libtool.m4 [darwin]: Don't use -all_load.
X-Git-Tag: release-1-9b~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3b055757b762464278f0b7a4b06a9144ae17b3d;p=thirdparty%2Flibtool.git

* m4/libtool.m4 [darwin]: Don't use -all_load.
---

diff --git a/ChangeLog b/ChangeLog
index 9afd82704..cf629b42d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-02  Geoffrey Keating  <geoffk@apple.com>
+
+	* m4/libtool.m4 [darwin]: Don't use -all_load.
+
 2004-08-01  Maciej W. Rozycki  <macro@linux-mips.org>
 
 	* m4/libtool.m4 (LT_AC_PROG_SED): Set SED when running from cache as 
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index c6b1986d7..f0be3e05c 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -3806,7 +3806,7 @@ _LT_EOF
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
@@ -3818,7 +3818,6 @@ _LT_EOF
     else
       case "$cc_basename" in
         xlc*)
-         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
          output_verbose_link_cmd='echo'
           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
@@ -4734,7 +4733,7 @@ if test -n "$compiler"; then
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
     if test "$GXX" = yes ; then
@@ -4759,7 +4758,6 @@ if test -n "$compiler"; then
       else
       case "$cc_basename" in
         xlc*)
-         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
          output_verbose_link_cmd='echo'
           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'