Skip to content

Commit d09f84a

Browse files
DimitryAndrictstellar
authored andcommitted
[compiler-rt] Force ABI to libcxxabi when building cxustom libc++
Follow-up to 458ead6, which replaced the bespoke CMakeLists.txt file for building a custom instrumented libc++ with an invocation of the runtimes build. In the the bespoke CMakeLists.txt, the LIBCXX_CXX_ABI setting was forced to libcxxabi, but this was not done for the CMake invocation for the runtimes build. This would cause CMake configuration issues on platforms where the default LIBCXX_CXX_ABI setting is not libcxxabi, such as FreeBSD. Add `-DLIBCXX_CXX_ABI=libcxxabi` to that invocation, to make sure the custom instrumented libc++ always uses the expected ABI. Reviewed By: phosek Differential Revision: https://reviews.llvm.org/D119554 (cherry picked from commit a9f1a9c)
1 parent e08bab8 commit d09f84a

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

compiler-rt/cmake/Modules/AddCompilerRT.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,7 @@ macro(add_custom_libcxx name prefix)
638638
-DLIBCXXABI_ENABLE_SHARED=OFF
639639
-DLIBCXXABI_HERMETIC_STATIC_LIBRARY=ON
640640
-DLIBCXXABI_INCLUDE_TESTS=OFF
641+
-DLIBCXX_CXX_ABI=libcxxabi
641642
-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
642643
-DLIBCXX_ENABLE_SHARED=OFF
643644
-DLIBCXX_HERMETIC_STATIC_LIBRARY=ON

0 commit comments

Comments
 (0)