add all needed parts of archives

1 files changed, 7 insertions, 1 deletions

diff --git a/tools/shared.py b/tools/shared.py
index 08fc581b..f6727249 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -541,13 +541,19 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' % { 'winfix': '' if not WINDOWS e
             print >> sys.stderr, 'Warning: Archive %s appears to be empty (recommendation: link an .so instead of .a)' % f
           else:
             Popen([LLVM_AR, 'x', f], stdout=PIPE).communicate() # if absolute paths, files will appear there. otherwise, in this directory
+            needed = False # We add or do not add the entire archive. We let llvm dead code eliminate parts we do not need, instead of
+                           # doing intra-dependencies between archive contents
             for content in contents:
               new_symbols = Building.llvm_nm(content)
               # Link in the .o if it provides symbols, *or* this is a singleton archive (which is apparently an exception in gcc ld)
               if new_symbols.defs.intersection(unresolved_symbols) or len(files) == 1:
+                needed = True
+            if needed:
+              actual_files += contents
+              for content in contents:
+                new_symbols = Building.llvm_nm(content)
                 resolved_symbols = resolved_symbols.union(new_symbols.defs)
                 unresolved_symbols = unresolved_symbols.union(new_symbols.undefs.difference(resolved_symbols)).difference(new_symbols.defs)
-                actual_files.append(content)
         finally:
           os.chdir(cwd)
     try_delete(target)