diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-04-08 21:37:42 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-04-08 21:37:42 +0000 |
| commit | fecbf5918b818f319f97b1f60ac591c159c0f089 (patch) | |
| tree | 1d80435251c172b91be0950783c7d41339000347 | |
| parent | 867131a96cadb59f69e8f4339c52448e20ce9b8a (diff) | |
| download | bcm5719-llvm-fecbf5918b818f319f97b1f60ac591c159c0f089.tar.gz bcm5719-llvm-fecbf5918b818f319f97b1f60ac591c159c0f089.zip | |
[libc++] Remove install_name and compatibility_version on OS X
CMake already specifies those, and we never actually want those to be
used. In fact, r357811 re-ordered those flags in a way that the
explicitly-provided install_name was overriding the CMake-provided
install_name (instead of the other way around). This caused the dylib
to be considered a system dylib, and hence the explicitly provided rpath
to be ignored. This, in turn, caused some unit tests to start linking
against the system libc++.dylib instead of the freshly-built one.
Specifically, the unit tests that started linking against the system
dylib are those that didn't specify a DYLD_LIBRARY_PATH, such as
last_write_time.sh.cpp.
llvm-svn: 357946
| -rw-r--r-- | libcxx/lib/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libcxx/lib/CMakeLists.txt b/libcxx/lib/CMakeLists.txt index 8825e628cab..92606feb6c9 100644 --- a/libcxx/lib/CMakeLists.txt +++ b/libcxx/lib/CMakeLists.txt @@ -198,8 +198,6 @@ if (LIBCXX_ENABLE_SHARED) set(RE_EXPORT_LIST "${CMAKE_CURRENT_SOURCE_DIR}/libc++abi.v${LIBCXX_LIBCPPABI_VERSION}.exp") endif() target_link_libraries(cxx_shared PRIVATE - "-compatibility_version 1" - "-install_name /usr/lib/libc++.1.dylib" "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" "-Wl,-reexported_symbols_list,${RE_EXPORT_LIST}" "-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/notweak.exp" |
