[libcxx] r344576 - [libcxx] Remove custom CMake code targeting Mac OS 10.6

Louis Dionne ldionne at apple.com
Mon Oct 15 17:31:32 PDT 2018


Author: ldionne
Date: Mon Oct 15 17:31:32 2018
New Revision: 344576

URL: http://llvm.org/viewvc/llvm-project?rev=344576&view=rev
Log:
[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.

Modified:
    libcxx/trunk/docs/ReleaseNotes.rst
    libcxx/trunk/lib/CMakeLists.txt

Modified: libcxx/trunk/docs/ReleaseNotes.rst
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/docs/ReleaseNotes.rst?rev=344576&r1=344575&r2=344576&view=diff
==============================================================================
--- libcxx/trunk/docs/ReleaseNotes.rst (original)
+++ libcxx/trunk/docs/ReleaseNotes.rst Mon Oct 15 17:31:32 2018
@@ -40,4 +40,4 @@ New Features
 
 API Changes
 -----------
-
+- Building libc++ for Mac OSX 10.6 is not supported anymore.

Modified: libcxx/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=344576&r1=344575&r2=344576&view=diff
==============================================================================
--- libcxx/trunk/lib/CMakeLists.txt (original)
+++ libcxx/trunk/lib/CMakeLists.txt Mon Oct 15 17:31:32 2018
@@ -149,14 +149,9 @@ if (LIBCXX_OSX_REEXPORT_SYSTEM_ABI_LIBRA
   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)




More information about the libcxx-commits mailing list