Martin Storsjo
5f919fe349
Use CMAKE_AR instead of the system default 'ar' for merging static libraries
...
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
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@313122 91177308-0d34-0410-b5e6-96231b3b80d8
2017-09-13 06:55:44 +00:00
Martell Malone
8122e2490e
libcxx: fix merge_archives error variable name
...
Differential Revision: https://reviews.llvm.org/D37728
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@313084 91177308-0d34-0410-b5e6-96231b3b80d8
2017-09-12 22:32:02 +00:00
Martin Storsjo
2c607f47f9
Handle object files named *.obj in merge_archives.py
...
Differential Revision: https://reviews.llvm.org/D37133
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@313072 91177308-0d34-0410-b5e6-96231b3b80d8
2017-09-12 20:54:15 +00:00
Eric Fiselier
60479ea31b
Make LIBCXX_ENABLE_STATIC_ABI_LIBRARY merge libc++.a and libc++abi.a
...
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@287373 91177308-0d34-0410-b5e6-96231b3b80d8
2016-11-18 19:53:45 +00:00
Eric Fiselier
d3b197fcb5
Make merge_archives.py executable
...
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@287337 91177308-0d34-0410-b5e6-96231b3b80d8
2016-11-18 11:29:05 +00:00
Eric Fiselier
fa054d2ad0
Add merge_archives.py utility
...
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@287336 91177308-0d34-0410-b5e6-96231b3b80d8
2016-11-18 11:26:14 +00:00
