diff --git a/libcxx/test/libcxx/vendor/apple/system-install-properties.sh.cpp b/libcxx/test/libcxx/vendor/apple/system-install-properties.sh.cpp --- 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 --- a/libcxx/utils/ci/apple-install-libcxx.sh +++ b/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