From: Gary V. Vaughan <gary@gnu.org>
Date: Sun, 5 Aug 2001 16:48:33 +0000 (+0000)
Subject: From Brad <brad@comstyle.com>:
X-Git-Tag: release-1-4-1~9
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3cfa7279cdbf85f555d560d7110e55cf51f3f534;p=thirdparty%2Flibtool.git

From Brad <brad@comstyle.com>:
* libtool.m4 (archive_cmds) [darwin, newsos, sysv4]: Replace
1.3 era $linkopts references with $linker_flags.
---

diff --git a/ChangeLog b/ChangeLog
index 752489683..30c6cd7fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-08-05  Gary V. Vaughan  <gary@gnu.org>
 
+	From Brad <brad@comstyle.com>:
+	* libtool.m4 (archive_cmds) [darwin, newsos, sysv4]: Replace
+	1.3 era $linkopts references with $linker_flags.
+
 	From Brad <brad@comstyle.com>:
 	* libtool.m4 [openbsd]:  OpenBSD can build modules without a `lib'
 	prefix and version number.
diff --git a/libtool.m4 b/libtool.m4
index 1e6007fbe..a5c1aa858 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -1541,7 +1541,7 @@ else
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
-    archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+    archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
     hardcode_direct=yes
@@ -1616,7 +1616,7 @@ else
     ;;
 
   newsos6)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
     hardcode_direct=yes
     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
     hardcode_libdir_separator=:
@@ -1719,7 +1719,7 @@ else
 
   sysv4)
     if test "x$host_vendor" = xsno; then
-      archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts'
+      archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes # is this really true???
     else
       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'