From: Tim Rice <tim@multitalents.net>
Date: Sat, 28 Feb 2009 13:12:03 +0000 (+0100)
Subject: Fix C++ template handling for old archives on UnixWare 7.1.4.
X-Git-Tag: v2.2.7b~107
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55b363f2147638c3b5c78df264286863f23ff605;p=thirdparty%2Flibtool.git

Fix C++ template handling for old archives on UnixWare 7.1.4.

* libltdl/m4/libtool.m4 (_LT_LANG_CXX_CONFIG) [sysv5*,
sco3.2v5*, sco5v6*] <old_archive_cmds>: For CC, add template
prelink step before archiving.  Fixes template.at test failures.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 022da07e2..9161d3f04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-28  Tim Rice  <tim@multitalents.net>
+
+	Fix C++ template handling for old archives on UnixWare 7.1.4.
+	* libltdl/m4/libtool.m4 (_LT_LANG_CXX_CONFIG) [sysv5*,
+	sco3.2v5*, sco5v6*] <old_archive_cmds>: For CC, add template
+	prelink step before archiving.  Fixes template.at test failures.
+
 2009-02-28  Török Edwin  <edwintorok@gmail.com>  (tiny change)
 	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index b75a55a01..51e891074 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -6219,6 +6219,8 @@ if test "$_lt_caught_CXX_error" != yes; then
           CC*)
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
 	    ;;
 	  *)
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'