changeset 4510:ff2c9c9371f1

Move mingw libstdc++.la hack from Cppunit to gcc.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Sat, 25 Oct 2008 22:42:48 +0200
parents 5e5b5ddbae4a
children 7642be552b8a
files gub/specs/cppunit.py gub/specs/cross/gcc.py
diffstat 2 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/cppunit.py	Sat Oct 25 22:42:19 2008 +0200
+++ b/gub/specs/cppunit.py	Sat Oct 25 22:42:48 2008 +0200
@@ -3,10 +3,3 @@
 class Cppunit (targetbuild.TargetBuild):
 #    source = 'http://surfnet.dl.sourceforge.net/sourceforge/cppunit/cppunit-1.10.2.tar.gz'
     source = 'http://surfnet.dl.sourceforge.net/sourceforge/cppunit/cppunit-1.12.1.tar.gz'
-
-class Cppunit__mingw (Cppunit):
-    def patch (self):
-        Cppunit.patch (self)
-        # old libtool barfs: no dll.a file
-        # self.system ('mv -f %(cross_prefix)s/i686-mingw32/lib/libstdc++.dll.a %(system_prefix)s/lib/libstdc++.a')
-        self.system ('mv %(system_prefix)s/lib/libstdc++.la %(system_prefix)s/lib/libstdc++.la- || :')
--- a/gub/specs/cross/gcc.py	Sat Oct 25 22:42:19 2008 +0200
+++ b/gub/specs/cross/gcc.py	Sat Oct 25 22:42:48 2008 +0200
@@ -116,6 +116,12 @@
             self.file_sub ([('/mingw/include','%(prefix_dir)s/include'),
                             ('/mingw/lib','%(prefix_dir)s/lib'),
                             ], f)
+    def install (self):
+        Gcc.install (self)
+        # libtool barfs: no libstdc++.dll.a file
+        self.system ('''
+mv %(install_prefix)s/lib/libstdc++.la %(install_prefix)s/lib/libstdc++.la-
+''')
 
 # http://gcc.gnu.org/PR24196            
 class this_works_but_has_string_exception_across_dll_bug_Gcc__cygwin (Gcc__mingw):