From ee386faa713e2429886225325e5b098b79325a2c Mon Sep 17 00:00:00 2001
From: "Gary V. Vaughan" <gary@gnu.org>
Date: Sat, 8 Sep 2001 02:50:07 +0000
Subject: [PATCH] * libtool.m4 (archive_cmds, archive_expsym_cmds) [solaris*]:
 Revert my 2001-09-06 patch. (no_undefined_flag)i [solaris*]: Revert
 Alexandre's 2001-04-11 patch.

---
 libtool.m4 | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/libtool.m4 b/libtool.m4
index ed698d5db..f86946e08 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -24,8 +24,6 @@
 
 # serial 46 AC_PROG_LIBTOOL
 
-builtin([undefine],[symbols])
-
 AC_DEFUN([AC_PROG_LIBTOOL],
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
 
@@ -1709,12 +1707,12 @@ else
     ;;
 
   solaris*)
-    no_undefined_flag=' -z defs'
+    no_undefined_flag=' -z text'
     # $CC -shared without GNU ld will not create a library from C++
     # object files and a static libstdc++, better avoid it by now
-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags `test "x$allow_undefined_flag" = "x$no_undefined_flag" && $CC --print-libgcc-file-name`'
+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
     archive_expsym_cmds='$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 `test "x$allow_undefined_flag" = "x$no_undefined_flag" && $CC --print-libgcc-file-name`~$rm $lib.exp'
+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_shlibpath_var=no
     case $host_os in
-- 
2.47.2