diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-04-05 21:05:32 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-04-05 21:05:32 +0000 |
| commit | cd9a528886ceb7ec0bf5fbaa09106fddaa2e08b7 (patch) | |
| tree | aacc0757e4f9d1b32f9cb2651288b54a88174f3a /libcxx | |
| parent | 7e7f79ccb19dd66e5447de60e4ae02d94dfe5130 (diff) | |
| download | bcm5719-llvm-cd9a528886ceb7ec0bf5fbaa09106fddaa2e08b7.tar.gz bcm5719-llvm-cd9a528886ceb7ec0bf5fbaa09106fddaa2e08b7.zip | |
[libc++][CMake] Make sure the benchmarks link against libc++abi
The refactoring in r357811 made it so that we didn't add the ABI library
to the list of LIBCXX_LIBRARIES. As a result, benchmarks didn't link to
the ABI library and were missing symbols. This broke the build bots.
As a drive-by fix, we also provide the SHARED ABI library to the linker
script instead of the STATIC ABI library.
This couldn't be discovered on Apple platforms because libc++.dylib
re-exports libc++abi.dylib symbols there.
llvm-svn: 357818
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/lib/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libcxx/lib/CMakeLists.txt b/libcxx/lib/CMakeLists.txt index c9d33e62f9e..8825e628cab 100644 --- a/libcxx/lib/CMakeLists.txt +++ b/libcxx/lib/CMakeLists.txt @@ -180,7 +180,8 @@ if (LIBCXX_ENABLE_SHARED) endif() else() target_link_libraries(cxx_shared PRIVATE "${LIBCXX_CXX_SHARED_ABI_LIBRARY}") - list(APPEND LIBCXX_INTERFACE_LIBRARIES "${LIBCXX_CXX_STATIC_ABI_LIBRARY}") + list(APPEND LIBCXX_INTERFACE_LIBRARIES "${LIBCXX_CXX_SHARED_ABI_LIBRARY}") # For the linker script + list(APPEND LIBCXX_LIBRARIES "${LIBCXX_CXX_SHARED_ABI_LIBRARY}") # For the benchmarks endif() # Maybe re-export symbols from libc++abi |
