OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[libc++abi] Assume that libcxx is checked out in the Apple build script 

Instead of using the libc++ headers provided alongside the toolchain,
use those in the sibling libcxx directory that we know is checked out.
Before the days of the monorepo, we couldn't assume that the libc++
repository was present when building libcxxabi. Since we can now make
that assumption, it's always better to use the version of libc++ that
is in lockstep with libc++abi, to avoid subtle bugs.
This commit is contained in:
Louis Dionne 2020-04-27 11:18:24 -04:00
parent 121ca44c19
commit a486edd03a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcxx/utils/ci/apple-install-libcxxabi.sh
View File

@ -120,7 +120,7 @@ for arch in ${architectures}; do
-DCMAKE_INSTALL_NAME_DIR="${install_name_dir}" \ -DCMAKE_INSTALL_NAME_DIR="${install_name_dir}" \
-DCMAKE_OSX_ARCHITECTURES="${arch}" \ -DCMAKE_OSX_ARCHITECTURES="${arch}" \
-DLIBCXXABI_LIBRARY_VERSION="${version}" \ -DLIBCXXABI_LIBRARY_VERSION="${version}" \
-DLIBCXXABI_LIBCXX_INCLUDES="$(xcrun --sdk "${sdk}" c++ -print-resource-dir)/../../../include/c++/v1" -DLIBCXXABI_LIBCXX_PATH="${llvm_root}/libcxx"
) )
xcrun --sdk "${sdk}" cmake --build "${build_dir}/${arch}" --target install-cxxabi -- -v xcrun --sdk "${sdk}" cmake --build "${build_dir}/${arch}" --target install-cxxabi -- -v