[libc++] Merge the Apple install-libcxx and libcxxabi scripts
Also, refactor the now-merged script to remove code duplication in the
creation of universal dylibs.
Cr-Mirrored-From: https://chromium.googlesource.com/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: b68bf11efc46b0a81b22089d6bd78ee9d30a1d22
diff --git a/utils/ci/apple-install-libcxx.sh b/utils/ci/apple-install-libcxx.sh
index 8af854a..3175dd0 100755
--- a/utils/ci/apple-install-libcxx.sh
+++ b/utils/ci/apple-install-libcxx.sh
@@ -97,10 +97,6 @@
fi
done
-install_name_dir="/usr/lib"
-dylib_name="libc++.1.dylib"
-make_symlink="yes"
-
function step() {
separator="$(printf "%0.s-" $(seq 1 ${#1}))"
echo
@@ -109,8 +105,13 @@
echo "${separator}"
}
+install_name_dir="/usr/lib"
+dylib_name="libc++.1.dylib"
+make_symlink="yes"
+headers_prefix="${install_dir}"
+
for arch in ${architectures}; do
- step "Building libc++.dylib for architecture ${arch}"
+ step "Building libc++.dylib and libc++abi.dylib for architecture ${arch}"
mkdir -p "${build_dir}/${arch}"
(cd "${build_dir}/${arch}" &&
xcrun --sdk "${sdk}" cmake "${llvm_root}/llvm" \
@@ -121,35 +122,57 @@
-DCMAKE_INSTALL_PREFIX="${build_dir}/${arch}-install" \
-DCMAKE_INSTALL_NAME_DIR="${install_name_dir}" \
-DCMAKE_OSX_ARCHITECTURES="${arch}" \
+ -DLIBCXXABI_LIBRARY_VERSION="${version}" \
-DLIBCXX_INCLUDE_BENCHMARKS=OFF \
-DLIBCXX_INCLUDE_TESTS=OFF
)
- xcrun --sdk "${sdk}" cmake --build "${build_dir}/${arch}" --target install-cxx -- -v
+ xcrun --sdk "${sdk}" cmake --build "${build_dir}/${arch}" --target install-cxx install-cxxabi -- -v
done
-step "Creating a universal dylib from the dylibs for all architectures"
-input_dylibs=$(for arch in ${architectures}; do
- echo "${build_dir}/${arch}-install/lib/${dylib_name}"
-done)
-xcrun --sdk "${sdk}" lipo -create ${input_dylibs} -output "${build_dir}/${dylib_name}"
+function universal_dylib() {
+ dylib=${1}
-step "Installing the (stripped) universal dylib to ${install_dir}/usr/lib"
-mkdir -p "${install_dir}/usr/lib"
-cp "${build_dir}/${dylib_name}" "${install_dir}/usr/lib/${dylib_name}"
-xcrun --sdk "${sdk}" strip -S "${install_dir}/usr/lib/${dylib_name}"
+ inputs=$(for arch in ${architectures}; do echo "${build_dir}/${arch}-install/lib/${dylib}"; done)
+
+ step "Creating a universal dylib ${dylib} from the dylibs for all architectures"
+ xcrun --sdk "${sdk}" lipo -create ${inputs} -output "${build_dir}/${dylib}"
+
+ step "Installing the (stripped) universal dylib to ${install_dir}/usr/lib"
+ mkdir -p "${install_dir}/usr/lib"
+ cp "${build_dir}/${dylib}" "${install_dir}/usr/lib/${dylib}"
+ xcrun --sdk "${sdk}" strip -S "${install_dir}/usr/lib/${dylib}"
+
+ step "Installing the unstripped dylib and the dSYM bundle to ${symbols_dir}"
+ xcrun --sdk "${sdk}" dsymutil "${build_dir}/${dylib}" -o "${symbols_dir}/${dylib}.dSYM"
+ cp "${build_dir}/${dylib}" "${symbols_dir}/${dylib}"
+}
+
+universal_dylib ${dylib_name}
+universal_dylib libc++abi.dylib
+
if [[ "${make_symlink}" == "yes" ]]; then
(cd "${install_dir}/usr/lib" && ln -s "${dylib_name}" libc++.dylib)
fi
-step "Installing the unstripped dylib and the dSYM bundle to ${symbols_dir}"
-xcrun --sdk "${sdk}" dsymutil "${build_dir}/${dylib_name}" -o "${symbols_dir}/${dylib_name}.dSYM"
-cp "${build_dir}/${dylib_name}" "${symbols_dir}/${dylib_name}"
-
-#
# Install the headers by copying the headers from one of the built architectures
# into the install directory. Headers from all architectures should be the same.
-#
+step "Installing the libc++ and libc++abi headers to ${headers_prefix}/usr/include"
any_arch=$(echo ${architectures} | cut -d ' ' -f 1)
-mkdir -p "${install_dir}/usr/include"
-ditto "${build_dir}/${any_arch}-install/include" "${install_dir}/usr/include"
+mkdir -p "${headers_prefix}/usr/include"
+ditto "${build_dir}/${any_arch}-install/include" "${headers_prefix}/usr/include"
+ditto "${llvm_root}/libcxxabi/include" "${headers_prefix}/usr/include" # TODO: libcxxabi should install its headers in CMake
+if [[ $EUID -eq 0 ]]; then # Only chown if we're running as root
+ chown -R root:wheel "${headers_prefix}/usr/include"
+fi
+
+step "Installing the libc++ and libc++abi licenses"
+mkdir -p "${headers_prefix}/usr/local/OpenSourceLicenses"
+cp "${llvm_root}/libcxx/LICENSE.TXT" "${headers_prefix}/usr/local/OpenSourceLicenses/libcxx.txt"
+cp "${llvm_root}/libcxxabi/LICENSE.TXT" "${headers_prefix}/usr/local/OpenSourceLicenses/libcxxabi.txt"
+
+# Also install a static archive for libc++abi
+libcxxabi_archives=$(for arch in ${architectures}; do echo "${build_dir}/${arch}-install/lib/libc++abi.a"; done)
+step "Creating a universal libc++abi static archive from the static archives for each architecture"
+mkdir -p "${install_dir}/usr/local/lib/libcxx"
+xcrun --sdk "${sdk}" libtool -static ${libcxxabi_archives} -o "${install_dir}/usr/local/lib/libcxx/libc++abi-static.a"