[compiler-rt] r215468 - Fix the CMake build when setting MACOSX_DEPLOYMENT_TARGET

[Hans Wennborg]

Author: hans
Date: Tue Aug 12 15:03:33 2014
New Revision: 215468

URL: http://llvm.org/viewvc/llvm-project?rev=215468&view=rev
Log:
Fix the CMake build when setting MACOSX_DEPLOYMENT_TARGET

If we don't reset CMAKE_OSX_DEPLOYMENT_TARGET, it will end up in
CFLAGS together with the -mmacosx-version-min that we set,
and the compiler errors about the conflict.

Modified:
    compiler-rt/trunk/CMakeLists.txt

Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=215468&r1=215467&r2=215468&view=diff
==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Tue Aug 12 15:03:33 2014
@@ -294,6 +294,7 @@ if(APPLE)
   else()
     set(SANITIZER_MIN_OSX_VERSION 10.6)
   endif()
+  set(CMAKE_OSX_DEPLOYMENT_TARGET "") # We're setting the flag manually below.
   set(DARWIN_osx_CFLAGS -mmacosx-version-min=${SANITIZER_MIN_OSX_VERSION})
   set(DARWIN_iossim_CFLAGS 
     -mios-simulator-version-min=7.0 -isysroot ${IOSSIM_SDK_DIR})