Commit dffbaa40 authored by Petr Hosek's avatar Petr Hosek
Browse files

[libcxx] Drop -D option from libtool when merging archives 

This is a follow up to D74108. This option is not supported by older
versions of libtool so remove it. We keep the -s option to build the
index.
parent 7ad30f42

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, '-sD'] + files,

        execute_command_verbose([libtool_exe, '-static', '-o', args.output, '-s'] + files,

                                cwd=temp_directory_root, verbose=args.verbose)

    else:

        execute_command_verbose([ar_exe, 'rcsD', args.output] + files,

        execute_command_verbose([ar_exe, 'rcs', args.output] + files,

                                cwd=temp_directory_root, verbose=args.verbose)