From: Gary V. Vaughan <gary@gnu.org>
Date: Thu, 6 Sep 2001 21:44:10 +0000 (+0000)
Subject: * libtool.m4 (archive_cmds, archive_expsym_cmds) [solaris*]: Changing
X-Git-Tag: release-1-4-2~15
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=584c3de7958cb7a894222fcc3f355aff8ea41884;p=thirdparty%2Flibtool.git

* libtool.m4 (archive_cmds, archive_expsym_cmds) [solaris*]: Changing
no_undefined_flag from `-z text' to `-z defs' (see entry below at
2001-04-11  Alexandre Oliva  <aoliva@redhat.com>) has a problem.
when linking a shared library with gcc calling /usr/ccs/bin/ld (eg.
the gcc supplied with Solaris 8 companion CD), using the flag
-no-undefined, shared library linking will always fail because of
the unresolved symbols from libgcc.a.  Consequently we have to
provide a path to libgcc.a when linking shared libraries in
conjunction with -no-undefined!
---

diff --git a/ChangeLog b/ChangeLog
index 42c4a1f41..c38343f79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2001-09-06  Gary V. Vaughan  <gary@gnu.org>
 
+	* libtool.m4 (archive_cmds, archive_expsym_cmds) [solaris*]: Changing
+	no_undefined_flag from `-z text' to `-z defs' (see entry below at
+	2001-04-11  Alexandre Oliva  <aoliva@redhat.com>) has a problem.
+	when linking a shared library with gcc calling /usr/ccs/bin/ld (eg.
+	the gcc supplied with Solaris 8 companion CD), using the flag
+	-no-undefined, shared library linking will always fail because of
+	the unresolved symbols from libgcc.a.  Consequently we have to
+	provide a path to libgcc.a when linking shared libraries in
+	conjunction with -no-undefined!
+
 	From Michael Pruett <mpruett@engr.sgi.com>:
 	* libltdl/ltdl.c (find_module): `0' valued arguments to
 	tryall_dlopen_module() must be explicitly cast to avoid compiler
diff --git a/bootstrap b/bootstrap
index 076ca20ee..1ea6b760f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -3,6 +3,8 @@
 # helps bootstrapping libtool, when checked out from CVS
 # requires GNU autoconf and GNU automake
 
+find . -name autom4te.cache -print | xargs rm -r
+
 file=Makefile.in
 
 : ${ACLOCAL=aclocal}
diff --git a/libtool.m4 b/libtool.m4
index e7898265d..ed698d5db 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -1712,9 +1712,9 @@ else
     no_undefined_flag=' -z defs'
     # $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'
+    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_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~$rm $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'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_shlibpath_var=no
     case $host_os in