From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Sun, 6 Jun 1999 23:52:35 +0000 (+0000)
Subject: * ltconfig.in: Support new GNU ld --help output format.
X-Git-Tag: release-1-3-3~20
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7089681eb61e31d8bfc0b4f246014b7c36c6b6c0;p=thirdparty%2Flibtool.git

* ltconfig.in: Support new GNU ld --help output format.
* NEWS:  Likewise.
Reported by Gaël Quéri <gael@baoule.dyndns.org> and
H.J. Lu <hjl@varesearch.com>.
---

diff --git a/ChangeLog b/ChangeLog
index 72ceb7b02..e1d26a1ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-06-06  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+	* ltconfig.in: Support new GNU ld --help output format.
+	* NEWS:  Likewise.
+	Reported by Gaël Quéri <gael@baoule.dyndns.org> and
+	H.J. Lu <hjl@varesearch.com>.
+
 1999-06-05  Mark Kettenis  <kettenis@gnu.org>
 
 	* ltconfig.in: Update support for the Hurd.  Make sure that the
diff --git a/NEWS b/NEWS
index b0ca8f4bc..1938cd579 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 NEWS - list of user-visible changes between releases of GNU Libtool
 
 New in CVS version 1.3.2a, Libtool team:
+* Support new GNU ld (ELF support detection).
 * Expand convenience libraries when creating reloadable objects.
 * Do not pass -whole-archive or equivalent to symbol extractor.
 * Create directory to expand convenience libraries only when needed.
diff --git a/ltconfig.in b/ltconfig.in
index c4d6ec304..d7890e156 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1110,7 +1110,7 @@ EOF
     ;;
 
   beos*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+    if $LD --help 2>&1 | sed -n '/: supported targets:/,/:/p' | grep 'elf' > /dev/null; then
       allow_undefined_flag=unsupported
       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
       # support --undefined.  This deserves some investigation.  FIXME
@@ -1152,7 +1152,7 @@ EOF
     ;;
 
   netbsd*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+    if $LD --help 2>&1 | sed -n '/: supported targets:/,/:/p' | grep 'elf' > /dev/null; then
       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
     else
@@ -1174,7 +1174,7 @@ EOF
 *** used, and then restart.
 
 EOF
-    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+    elif $LD --help 2>&1 | sed -n '/: supported targets:/,/:/p' | grep 'elf' > /dev/null; then
       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
     else
@@ -1190,7 +1190,7 @@ EOF
     ;;
 
   *)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+    if $LD --help 2>&1 | sed -n '/: supported targets:/,/:/p' | grep 'elf' > /dev/null; then
       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
     else