Bug 938526 - Ignore import libraries when dealing with --extract in e…

…xpandlibs_exec.py. r=khuey
sailfishos · Nov 19, 2013 · 14ea599 · 14ea599
1 parent 659e5ac
commit 14ea599
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/config/expandlibs_exec.py b/config/expandlibs_exec.py
@@ -84,8 +84,14 @@ def _extract(self, args):
                     self.tmp.append(tmp)
                     if conf.AR == 'lib':
                         out = subprocess.check_output([conf.AR, '-NOLOGO', '-LIST', arg])
-                        for l in out.splitlines():
-                            subprocess.call([conf.AR, '-NOLOGO', '-EXTRACT:%s' % l, os.path.abspath(arg)], cwd=tmp)
+                        files = out.splitlines()
+                        # If lib -list returns a list full of dlls, it's an
+                        # import lib.
+                        if all(isDynamicLib(f) for f in files):
+                            newlist += [arg]
+                            continue
+                        for f in files:
+                            subprocess.call([conf.AR, '-NOLOGO', '-EXTRACT:%s' % f, os.path.abspath(arg)], cwd=tmp)
                     else:
                         subprocess.call(ar_extract + [os.path.abspath(arg)], cwd=tmp)
                     objs = []

diff --git a/js/src/config/expandlibs_exec.py b/js/src/config/expandlibs_exec.py
@@ -84,8 +84,14 @@ def _extract(self, args):
                     self.tmp.append(tmp)
                     if conf.AR == 'lib':
                         out = subprocess.check_output([conf.AR, '-NOLOGO', '-LIST', arg])
-                        for l in out.splitlines():
-                            subprocess.call([conf.AR, '-NOLOGO', '-EXTRACT:%s' % l, os.path.abspath(arg)], cwd=tmp)
+                        files = out.splitlines()
+                        # If lib -list returns a list full of dlls, it's an
+                        # import lib.
+                        if all(isDynamicLib(f) for f in files):
+                            newlist += [arg]
+                            continue
+                        for f in files:
+                            subprocess.call([conf.AR, '-NOLOGO', '-EXTRACT:%s' % f, os.path.abspath(arg)], cwd=tmp)
                     else:
                         subprocess.call(ar_extract + [os.path.abspath(arg)], cwd=tmp)
                     objs = []