commit 766afb54d21c193457e3325f4dd9dd9ab9211173
author Petr Hosek <phosek@google.com> Mon Sep 28 14:18:55 2020 -0700
committer Petr Hosek <phosek@google.com> Mon Sep 28 14:50:09 2020 -0700
tree 4822226bdd3b0f5e37948ca20d848ad8896a03d5
parent 3c989bcda6f9c5dfed78f2c69e364e5eea46e023

[libcxx] Don't pass -s to libtool

This flag is the default in libtool on Darwin, and it's not supported
by llvm-libtool-darwin causing a build failure.

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

Cr-Mirrored-From: https://chromium.googlesource.com/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 2d657d1bd7f1e45722ced24e1da897ba5e87ab7a

utils/merge_archives.py

diff --git a/utils/merge_archives.py b/utils/merge_archives.py
index d751526..2fcb474 100755
--- a/utils/merge_archives.py
+++ b/utils/merge_archives.py
@@ -143,7 +143,7 @@
 
     if args.use_libtool:
         files = [f for f in files if not f.startswith('__.SYMDEF')]
-        execute_command_verbose([libtool_exe, '-static', '-o', args.output, '-s'] + files,
+        execute_command_verbose([libtool_exe, '-static', '-o', args.output] + files,
                                 cwd=temp_directory_root, verbose=args.verbose)
     else:
         execute_command_verbose([ar_exe, 'rcs', args.output] + files,