[libcxx-commits] [libcxx] 603acd9 - [libcxx] When merging archives, build index even on Darwin

[Petr Hosek via libcxx-commits]

Author: Petr Hosek
Date: 2020-03-02T11:02:42-08:00
New Revision: 603acd9626704956c0cf90b18b746795962ddc93

URL: https://github.com/llvm/llvm-project/commit/603acd9626704956c0cf90b18b746795962ddc93
DIFF: https://github.com/llvm/llvm-project/commit/603acd9626704956c0cf90b18b746795962ddc93.diff

LOG: [libcxx] When merging archives, build index even on Darwin

We always want to build the table of contents. Additionally, we also
set the flag to make the output deterministic which is already the
default for llvm-ar.

Differential Revision: https://reviews.llvm.org/D74108

Added: 
    

Modified: 
    libcxx/utils/merge_archives.py

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/merge_archives.py b/libcxx/utils/merge_archives.py
index 4c31854d2b7e..d784ea0435f5 100755
--- a/libcxx/utils/merge_archives.py
+++ b/libcxx/utils/merge_archives.py
@@ -143,10 +143,10 @@ def main():
 
     if args.use_libtool:
         files = [f for f in files if not f.startswith('__.SYMDEF')]
-        execute_command_verbose([libtool_exe, '-static', '-o', args.output] + files,
+        execute_command_verbose([libtool_exe, '-static', '-o', args.output, '-sD'] + files,
                                 cwd=temp_directory_root, verbose=args.verbose)
     else:
-        execute_command_verbose([ar_exe, 'rcs', args.output] + files,
+        execute_command_verbose([ar_exe, 'rcsD', args.output] + files,
                                 cwd=temp_directory_root, verbose=args.verbose)