[libcxx-commits] [PATCH] D146360: [libc++][Apple] Make sure we install libc++experimental.a
Louis Dionne via Phabricator via libcxx-commits
libcxx-commits at lists.llvm.org
Sat Mar 18 13:21:00 PDT 2023
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG16fe61ac7ba5: [libc++][Apple] Make sure we install libc++experimental.a (authored by ldionne).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D146360/new/
https://reviews.llvm.org/D146360
Files:
libcxx/test/libcxx/vendor/apple/system-install-properties.sh.cpp
libcxx/utils/ci/apple-install-libcxx.sh
Index: libcxx/utils/ci/apple-install-libcxx.sh
===================================================================
--- libcxx/utils/ci/apple-install-libcxx.sh
+++ libcxx/utils/ci/apple-install-libcxx.sh
@@ -150,6 +150,9 @@
universal_dylib libc++.1.dylib
universal_dylib libc++abi.dylib
(cd "${install_dir}/usr/lib" && ln -s "libc++.1.dylib" libc++.dylib)
+
+ experimental_libs=$(for arch in ${architectures}; do echo "${build_dir}/${arch}-install/lib/libc++experimental.a"; done)
+ xcrun lipo -create ${experimental_libs} -output "${install_dir}/usr/lib/libc++experimental.a"
fi
# Install the headers by copying the headers from one of the built architectures
Index: libcxx/test/libcxx/vendor/apple/system-install-properties.sh.cpp
===================================================================
--- libcxx/test/libcxx/vendor/apple/system-install-properties.sh.cpp
+++ libcxx/test/libcxx/vendor/apple/system-install-properties.sh.cpp
@@ -15,9 +15,10 @@
//
// RUN: stat "%{include}/__config"
-// Make sure we install libc++.1.dylib in the right location.
+// Make sure we install libc++.1.dylib and libc++experimental.a in the right location.
//
// RUN: stat "%{lib}/libc++.1.dylib"
+// RUN: stat "%{lib}/libc++experimental.a"
// Make sure we install a symlink from libc++.dylib to libc++.1.dylib.
//
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D146360.506312.patch
Type: text/x-patch
Size: 1339 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20230318/55debb44/attachment.bin>
More information about the libcxx-commits
mailing list