<div dir="ltr">(For libtool, -s is the default fwiw.)</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Mar 2, 2020 at 7:25 PM Petr Hosek via libcxx-commits <<a href="mailto:libcxx-commits@lists.llvm.org">libcxx-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Author: Petr Hosek<br>
Date: 2020-03-02T16:07:18-08:00<br>
New Revision: dffbaa40142113416fef6d3514e13fbc362bb888<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/dffbaa40142113416fef6d3514e13fbc362bb888" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/dffbaa40142113416fef6d3514e13fbc362bb888</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/dffbaa40142113416fef6d3514e13fbc362bb888.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/dffbaa40142113416fef6d3514e13fbc362bb888.diff</a><br>
<br>
LOG: [libcxx] Drop -D option from libtool when merging archives<br>
<br>
This is a follow up to D74108. This option is not supported by older<br>
versions of libtool so remove it. We keep the -s option to build the<br>
index.<br>
<br>
Added: <br>
<br>
<br>
Modified: <br>
    libcxx/utils/merge_archives.py<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff  --git a/libcxx/utils/merge_archives.py b/libcxx/utils/merge_archives.py<br>
index d784ea0435f5..cc96cb2aa50c 100755<br>
--- a/libcxx/utils/merge_archives.py<br>
+++ b/libcxx/utils/merge_archives.py<br>
@@ -143,10 +143,10 @@ def main():<br>
<br>
     if args.use_libtool:<br>
         files = [f for f in files if not f.startswith('__.SYMDEF')]<br>
-        execute_command_verbose([libtool_exe, '-static', '-o', args.output, '-sD'] + files,<br>
+        execute_command_verbose([libtool_exe, '-static', '-o', args.output, '-s'] + files,<br>
                                 cwd=temp_directory_root, verbose=args.verbose)<br>
     else:<br>
-        execute_command_verbose([ar_exe, 'rcsD', args.output] + files,<br>
+        execute_command_verbose([ar_exe, 'rcs', args.output] + files,<br>
                                 cwd=temp_directory_root, verbose=args.verbose)<br>
<br>
<br>
<br>
<br>
<br>
_______________________________________________<br>
libcxx-commits mailing list<br>
<a href="mailto:libcxx-commits@lists.llvm.org" target="_blank">libcxx-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/libcxx-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/libcxx-commits</a><br>
</blockquote></div>