diff options
| author | Louis Dionne <ldionne@apple.com> | 2018-10-16 00:31:32 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2018-10-16 00:31:32 +0000 |
| commit | 950b8e114e89e0b6594fc52ead37942b54a6ffc2 (patch) | |
| tree | d425f950be1836b503ffcc0b96a5917b248648f5 | |
| parent | 0981eaab4766ebfdc355c8de8d4dad67f879efb6 (diff) | |
| download | bcm5719-llvm-950b8e114e89e0b6594fc52ead37942b54a6ffc2.tar.gz bcm5719-llvm-950b8e114e89e0b6594fc52ead37942b54a6ffc2.zip | |
[libcxx] Remove custom CMake code targeting Mac OS 10.6
libc++ has dropped support for Mac OS 10.6 for a while, and we don't
have any testers set up for that OS.
This commit puts in an error message so that people can reach out to
the libc++ maintainers in case support for 10.6 is still expected (as
opposed to silently failing in weird ways). We can completely drop
support for 10.6 and remove the error message some time in the future
when we're sure that nobody is relying on it.
llvm-svn: 344576
| -rw-r--r-- | libcxx/docs/ReleaseNotes.rst | 2 | ||||
| -rw-r--r-- | libcxx/lib/CMakeLists.txt | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/libcxx/docs/ReleaseNotes.rst b/libcxx/docs/ReleaseNotes.rst index 7e8e307b244..52d7a1ed42f 100644 --- a/libcxx/docs/ReleaseNotes.rst +++ b/libcxx/docs/ReleaseNotes.rst @@ -40,4 +40,4 @@ New Features API Changes ----------- - +- Building libc++ for Mac OSX 10.6 is not supported anymore. diff --git a/libcxx/lib/CMakeLists.txt b/libcxx/lib/CMakeLists.txt index e068edc8a7a..1fa315b062e 100644 --- a/libcxx/lib/CMakeLists.txt +++ b/libcxx/lib/CMakeLists.txt @@ -149,14 +149,9 @@ if (LIBCXX_OSX_REEXPORT_SYSTEM_ABI_LIBRARY) endif() if ( CMAKE_OSX_DEPLOYMENT_TARGET STREQUAL "10.6" ) - add_definitions(-D__STRICT_ANSI__) - add_link_flags( - "-compatibility_version 1" - "-current_version 1" - "-install_name /usr/lib/libc++.1.dylib" - "-Wl,-reexport_library,/usr/lib/libc++abi.dylib" - "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" - "/usr/lib/libSystem.B.dylib") + message(FATAL_ERROR "Mac OSX 10.6 is not supported anymore as a deployment " + "target. If you need support for this, please contact " + "the libc++ maintainers.") else() if (DEFINED CMAKE_OSX_SYSROOT AND NOT CMAKE_OSX_SYSROOT STREQUAL "") list(FIND CMAKE_OSX_ARCHITECTURES "armv7" OSX_HAS_ARMV7) |
