Commit 603acd96 authored by Petr Hosek's avatar Petr Hosek
Browse files

[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
parent 69d2b675

libcxx/utils/merge_archives.py

+2 −2
Original line number Diff line number Diff line
@@ -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)