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 022da07e2f9185a24c543d6dc67d052d323fd4f2..9161d3f04803fb985ef4f4c4543806b5ef8e867e 100644 (file)
--- 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 b75a55a01f86ad46d47b2b1bd4bb7bded71b99b7..51e89107475c7d051a05d75dbcd3328a6cce4364 100644 (file)
--- 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'