commit c05dd074e7e61b3dba8086caf36ee9151a8c0a5d
author Alexey Samsonov <vonosmas@gmail.com> Mon Jun 22 23:30:28 2015 +0000
committer Alexey Samsonov <vonosmas@gmail.com> Mon Jun 22 23:30:28 2015 +0000
tree 6fd05acf0aaa9964bc604b0753fff60be39da6e5
parent 9d5891fd3422ff63fa2e851ae99cfb19c31206ce

[CMake] Respect the value of -mmacosx-version-min flag.

Make sure that sanitizer runtimes target OS X version provided in
-mmacosx-version-min= flag. Enforce that it should be at least 10.7.

llvm-svn: 240356

compiler-rt/CMakeLists.txt

diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 7daee7c..4932ac2 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -292,14 +292,21 @@
   find_darwin_sdk_dir(OSX_SDK_DIR macosx)
   find_darwin_sdk_dir(IOSSIM_SDK_DIR iphonesimulator)
 
-  string(REGEX MATCH "-mmacosx-version-min="
-         MACOSX_VERSION_MIN_FLAG "${CMAKE_CXX_FLAGS}")
   set(SANITIZER_COMMON_SUPPORTED_OS osx)
-  if (IOSSIM_SDK_DIR AND NOT MACOSX_VERSION_MIN_FLAG)
-    list(APPEND SANITIZER_COMMON_SUPPORTED_OS iossim)
+  string(REGEX MATCH "-mmacosx-version-min=([.0-9]+)"
+         MACOSX_VERSION_MIN_FLAG "${CMAKE_CXX_FLAGS}")
+  if(MACOSX_VERSION_MIN_FLAG)
+    set(SANITIZER_MIN_OSX_VERSION "${CMAKE_MATCH_1}")
+    if(SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.7")
+      message(FATAL_ERROR "Too old OS X version: ${SANITIZER_MIN_OSX_VERSION}")
+    endif()
+  else()
+    set(SANITIZER_MIN_OSX_VERSION 10.7)
+    if(IOSSIM_SDK_DIR)
+      list(APPEND SANITIZER_COMMON_SUPPORTED_OS iossim)
+    endif()
   endif()
 
-  set(SANITIZER_MIN_OSX_VERSION 10.7)
   set(CMAKE_OSX_DEPLOYMENT_TARGET "") # We're setting the flag manually below.
   set(DARWIN_osx_CFLAGS -mmacosx-version-min=${SANITIZER_MIN_OSX_VERSION}
     -stdlib=libc++)