[libcxx-commits] [libcxx] r355336 - [libc++] Remove old CMake workaround

[Louis Dionne via libcxx-commits]

Author: ldionne
Date: Mon Mar  4 12:52:14 2019
New Revision: 355336

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

Modified:
    libcxx/trunk/lib/CMakeLists.txt

Modified: libcxx/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=355336&r1=355335&r2=355336&view=diff
==============================================================================
--- libcxx/trunk/lib/CMakeLists.txt (original)
+++ libcxx/trunk/lib/CMakeLists.txt Mon Mar  4 12:52:14 2019
@@ -148,27 +148,21 @@ if (LIBCXX_OSX_REEXPORT_LIBCXXABI_SYMBOL
     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()