[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.
Cr-Mirrored-From: https://chromium.googlesource.com/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: dffbaa40142113416fef6d3514e13fbc362bb888
diff --git a/utils/merge_archives.py b/utils/merge_archives.py
index d784ea0..cc96cb2 100755
--- a/utils/merge_archives.py
+++ b/utils/merge_archives.py
@@ -143,10 +143,10 @@
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)