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

Nico Weber via libcxx-commits libcxx-commits at lists.llvm.org
Mon Mar 2 17:39:23 PST 2020


(For libtool, -s is the default fwiw.)

On Mon, Mar 2, 2020 at 7:25 PM Petr Hosek via libcxx-commits <
libcxx-commits at lists.llvm.org> wrote:

>
> Author: Petr Hosek
> Date: 2020-03-02T16:07:18-08:00
> New Revision: dffbaa40142113416fef6d3514e13fbc362bb888
>
> URL:
> https://github.com/llvm/llvm-project/commit/dffbaa40142113416fef6d3514e13fbc362bb888
> DIFF:
> https://github.com/llvm/llvm-project/commit/dffbaa40142113416fef6d3514e13fbc362bb888.diff
>
> LOG: [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.
>
> Added:
>
>
> Modified:
>     libcxx/utils/merge_archives.py
>
> Removed:
>
>
>
>
> ################################################################################
> diff  --git a/libcxx/utils/merge_archives.py
> b/libcxx/utils/merge_archives.py
> index d784ea0435f5..cc96cb2aa50c 100755
> --- a/libcxx/utils/merge_archives.py
> +++ b/libcxx/utils/merge_archives.py
> @@ -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)
>
>
>
>
>
> _______________________________________________
> libcxx-commits mailing list
> libcxx-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/libcxx-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20200302/f3c6175b/attachment-0001.html>


More information about the libcxx-commits mailing list