commit 7f3087ed7c0e3b194eab268765190c0996f6aff0
author Louis Dionne <ldionne@apple.com> Mon Mar 04 20:52:14 2019 +0000
committer Louis Dionne <ldionne@apple.com> Mon Mar 04 20:52:14 2019 +0000
tree 8fb87d4bd209981e8dd0e08c6223e6a7bb3647ee
parent a6c5a26883e30f284e2603f6fa2109ff5eab688a

[libc++] Remove old CMake workaround

We haven't had any complaints so far, and I don't think anybody builds
libc++ from source for that old platform anymore.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@355336 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CMakeLists.txt

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index e5313f1..22a9bf3 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -148,27 +148,21 @@
     endif()
   endif()
 
-  if ( CMAKE_OSX_DEPLOYMENT_TARGET STREQUAL "10.6" )
-    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.")
+  if ("armv7" IN_LIST CMAKE_OSX_ARCHITECTURES)
+    set(RE_EXPORT_LIST "${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp")
   else()
-    if ("armv7" IN_LIST CMAKE_OSX_ARCHITECTURES)
-      set(RE_EXPORT_LIST "${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp")
-    else()
-      set(RE_EXPORT_LIST "${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
-    endif()
-    add_link_flags(
-      "-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\""
-      "-Wl,-force_symbols_weak_list,\"${CMAKE_CURRENT_SOURCE_DIR}/weak.exp\"")
+    set(RE_EXPORT_LIST "${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
+  endif()
+  add_link_flags(
+    "-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\""
+    "-Wl,-force_symbols_weak_list,\"${CMAKE_CURRENT_SOURCE_DIR}/weak.exp\"")
 
-    if (NOT LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS)
-      add_link_flags("-Wl,-reexported_symbols_list,\"${CMAKE_CURRENT_SOURCE_DIR}/libc++abi-new-delete.exp\"")
-    endif()
+  if (NOT LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS)
+    add_link_flags("-Wl,-reexported_symbols_list,\"${CMAKE_CURRENT_SOURCE_DIR}/libc++abi-new-delete.exp\"")
   endif()
 endif()