This is an archive of the discontinued LLVM Phabricator instance.

Differential D146361

[libc++][Apple] Make sure to set the LIBCXX_LIBRARY_VERSION when building for Apple
ClosedPublic

Authored by ldionne on Mar 18 2023, 9:10 AM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Commits
rGd6c12cbee314: [libc++][Apple] Make sure to set the LIBCXX_LIBRARY_VERSION when building for…

Diff Detail

Event Timeline

ldionne created this revision.Mar 18 2023, 9:10 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 18 2023, 9:10 AM
Herald added subscribers: mikhail.ramalho, arichardson. · View Herald Transcript
ldionne requested review of this revision.Mar 18 2023, 9:10 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 18 2023, 9:10 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B220225: Diff 506300.Mar 18 2023, 1:21 PM
ldionne accepted this revision.Mar 18 2023, 1:21 PM

CI failures are unrelated.

This revision is now accepted and ready to land.Mar 18 2023, 1:21 PM
This revision was landed with ongoing or failed builds.Mar 18 2023, 1:22 PM
Closed by commit rGd6c12cbee314: [libc++][Apple] Make sure to set the LIBCXX_LIBRARY_VERSION when building for… (authored by ldionne). · Explain Why
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rGd6c12cbee314: [libc++][Apple] Make sure to set the LIBCXX_LIBRARY_VERSION when building for….

Revision Contents

PathSize
libcxx/
utils/
ci/
3 lines

Diff 506313

libcxx/utils/ci/apple-install-libcxx.sh

Show First 20 Lines • Show All 113 Lines • ▼ Show 20 Lines xcrun cmake -S "${llvm_root}/runtimes" \
-B "${build_dir}/${arch}" \ -B "${build_dir}/${arch}" \
-GNinja \ -GNinja \
-DCMAKE_MAKE_PROGRAM="$(xcrun --find ninja)" \ -DCMAKE_MAKE_PROGRAM="$(xcrun --find ninja)" \
-C "${llvm_root}/libcxx/cmake/caches/Apple.cmake" \ -C "${llvm_root}/libcxx/cmake/caches/Apple.cmake" \
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \ -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
-DCMAKE_INSTALL_PREFIX="${build_dir}/${arch}-install" \ -DCMAKE_INSTALL_PREFIX="${build_dir}/${arch}-install" \
-DCMAKE_INSTALL_NAME_DIR="/usr/lib" \ -DCMAKE_INSTALL_NAME_DIR="/usr/lib" \
-DCMAKE_OSX_ARCHITECTURES="${arch}" \ -DCMAKE_OSX_ARCHITECTURES="${arch}" \
-DLIBCXXABI_LIBRARY_VERSION="${version}" -DLIBCXXABI_LIBRARY_VERSION="${version}" \
-DLIBCXX_LIBRARY_VERSION="${version}"
if [ "$headers_only" = true ]; then if [ "$headers_only" = true ]; then
xcrun cmake --build "${build_dir}/${arch}" --target install-cxx-headers install-cxxabi-headers -- -v xcrun cmake --build "${build_dir}/${arch}" --target install-cxx-headers install-cxxabi-headers -- -v
else else
xcrun cmake --build "${build_dir}/${arch}" --target install-cxx install-cxxabi -- -v xcrun cmake --build "${build_dir}/${arch}" --target install-cxx install-cxxabi -- -v
fi fi
done done
▲ Show 20 Lines • Show All 51 Lines • Show Last 20 Lines