[libcxx-commits] [libcxx] 16fe61a - [libc++][Apple] Make sure we install libc++experimental.a

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2023-03-18T16:20:39-04:00
New Revision: 16fe61ac7ba57eb2233f2773d1944aaffb6c89b9

URL: https://github.com/llvm/llvm-project/commit/16fe61ac7ba57eb2233f2773d1944aaffb6c89b9
DIFF: https://github.com/llvm/llvm-project/commit/16fe61ac7ba57eb2233f2773d1944aaffb6c89b9.diff

LOG: [libc++][Apple] Make sure we install libc++experimental.a

Differential Revision: https://reviews.llvm.org/D146360

Added: 
    

Modified: 
    libcxx/test/libcxx/vendor/apple/system-install-properties.sh.cpp
    libcxx/utils/ci/apple-install-libcxx.sh

Removed: 
    


################################################################################
diff  --git a/libcxx/test/libcxx/vendor/apple/system-install-properties.sh.cpp b/libcxx/test/libcxx/vendor/apple/system-install-properties.sh.cpp
index aaa9ad7a7d0e3..e155013ef3c02 100644
--- a/libcxx/test/libcxx/vendor/apple/system-install-properties.sh.cpp
+++ b/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.
 //

diff  --git a/libcxx/utils/ci/apple-install-libcxx.sh b/libcxx/utils/ci/apple-install-libcxx.sh
index dd349153ad6f7..e12e295bffb1a 100755
--- a/libcxx/utils/ci/apple-install-libcxx.sh
+++ b/libcxx/utils/ci/apple-install-libcxx.sh
@@ -150,6 +150,9 @@ if [ "$headers_only" != true ]; then
     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