summaryrefslogtreecommitdiffstats
path: root/libcxx/utils/merge_archives.py
Commit message (Collapse)AuthorAgeFilesLines
* [libc++] Improve Python 3 compatibility for merge_archives.pyLouis Dionne2019-08-231-1/+2
| | | | | | | | | | | | Popen.communicate() method in Python 2 returns a pair of strings, and in Python 3 it returns a pair of byte-like objects unless universal_newlines is set to True. This led to an error when using Python 3. With this patch, merge_archives.py works fine with Python 3. Thanks to Sergej Jaskiewicz for the patch. Differential Revision: https://reviews.llvm.org/D66649 llvm-svn: 369764
* [libcxx] Use libtool when merging archives on Apple platformsPetr Hosek2019-06-021-2/+20
| | | | | | | | | | ar doesn't produce the correct results when used for linking static archives on Apple platforms, so instead use libtool -static which is the official way to build static archives on those platforms. Differential Revision: https://reviews.llvm.org/D62770 llvm-svn: 362311
* [libc++][CMake] Allow merging libc++abi.a into libc++ even on Apple platformsLouis Dionne2019-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | Summary: I can't see a good reason to disallow this, even though it isn't the standard way we build libc++ for Apple platforms. Making this work on Apple platforms requires using different flags for --whole-archive and removing the -D flag when running `ar` to merge archives because that flag isn't supported by the `ar` shipped on Apple platforms. This shouldn't be an issue since the -D option appears to be enabled by default in GNU `ar`. Reviewers: phosek, EricWF, serge-sans-paille Subscribers: mgorny, christof, jkorous, dexonsmith, libcxx-commits Differential Revision: https://reviews.llvm.org/D59513 llvm-svn: 356903
* [libcxx] Preserve order, avoid duplicates when merging static archivesPetr Hosek2019-02-111-8/+9
| | | | | | | | | | | glob can return files in arbitrary order which breaks deterministic builds. Rather, use `ar t` to list the files in each archive and preserve the original order. Using `ar q` results in duplicate entries in the archive, instead use `ar r` to avoid duplicates. Differential Revision: https://reviews.llvm.org/D58024 llvm-svn: 353671
* Update more file headers across all of the LLVM projects in the monorepoChandler Carruth2019-01-191-4/+3
| | | | | | | | | | | | | | | | | | to reflect the new license. These used slightly different spellings that defeated my regular expressions. We understand that people may be surprised that we're moving the header entirely to discuss the new license. We checked this carefully with the Foundation's lawyer and we believe this is the correct approach. Essentially, all code in the project is now made available by the LLVM project under our new license, so you will see that the license headers include that license only. Some of our contributors have contributed code under our old license, and accordingly, we have retained a copy of our old license notice in the top-level files in each project and repository. llvm-svn: 351648
* Use CMAKE_AR instead of the system default 'ar' for merging static librariesMartin Storsjo2017-09-131-3/+9
| | | | | | | | | | | | | | | Using the system default 'ar' might not be the right choice when cross compiling. Don't prepend the ar options by a dash, not all ar implementations support that (llvm-ar doesn't). Also pass the 's' option when creating the merged library, to create an index. Differential Revision: https://reviews.llvm.org/D37134 llvm-svn: 313122
* libcxx: fix merge_archives error variable nameMartell Malone2017-09-121-1/+1
| | | | | | Differential Revision: https://reviews.llvm.org/D37728 llvm-svn: 313084
* Handle object files named *.obj in merge_archives.pyMartin Storsjo2017-09-121-1/+1
| | | | | | Differential Revision: https://reviews.llvm.org/D37133 llvm-svn: 313072
* Make LIBCXX_ENABLE_STATIC_ABI_LIBRARY merge libc++.a and libc++abi.aEric Fiselier2016-11-181-9/+20
| | | | llvm-svn: 287373
* Make merge_archives.py executableEric Fiselier2016-11-181-0/+0
| | | | llvm-svn: 287337
* Add merge_archives.py utilityEric Fiselier2016-11-181-0/+119
llvm-svn: 287336
OpenPOWER on IntegriCloud