Mercurial > gub

changeset 6284:75f24dabcf13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix libgcc dependency
author Masamichi Hosoda <trueroad@users.noreply.github.com>
date Wed, 19 Nov 2014 21:11:15 +0900
parents 572749c1b0c5
children f13248459609
files gub/specs/cross/gcc.py
diffstat 1 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/cross/gcc.py	Wed Nov 19 20:06:49 2014 +0900
+++ b/gub/specs/cross/gcc.py	Wed Nov 19 21:11:15 2014 +0900
@@ -34,7 +34,10 @@
     def get_subpackage_definitions (self):
         d = cross.AutoBuild.get_subpackage_definitions (self)
         prefix_dir = self.settings.prefix_dir
-        d['c++-runtime'] = [prefix_dir + '/lib/libstdc++.so*']
+        d['c++-runtime'] = [
+            prefix_dir + '/lib/libstdc++.so*',
+            prefix_dir + '/lib/libgcc_s.so*',
+        ]
         return d
     def languages (self):
         return ['c', 'c++']
@@ -90,11 +93,19 @@
 ln -s usr/ %(system_root)s/mingw || true
 '''
         )
+    def get_subpackage_definitions (self):
+        d = cross.AutoBuild.get_subpackage_definitions (self)
+        prefix_dir = self.settings.prefix_dir
+        d['c++-runtime'] = [
+            prefix_dir + '/bin/libstdc++-*.dll',
+            prefix_dir + '/bin/libgcc_s_*.dll',
+        ]
+        return d
     def install (self):
         Gcc.install (self)
         self.system('''
 mkdir -p %(system_prefix)s/bin/
-cp %(install_prefix)s/lib/libgcc_s_sjlj-1.dll %(system_prefix)s/bin/
-cp %(install_prefix)s/cross/%(target_architecture)s/lib/libstdc++-6.dll %(system_prefix)s/bin/
+cp %(install_prefix)s/lib/libgcc_s_*.dll %(install_prefix)s/bin/
+cp %(install_prefix)s/cross/%(target_architecture)s/lib/libstdc++-*.dll %(install_prefix)s/bin/
 '''
         )