diff options
| author | Hans Wennborg <hans@hanshq.net> | 2014-08-12 20:03:33 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2014-08-12 20:03:33 +0000 |
| commit | a03feadeb2221d28fb21c847336b3ef697aaf5ff (patch) | |
| tree | 01cf2a84810ab0eed1269de2b28a1dcec807920f /compiler-rt | |
| parent | 4815f09bbede0421ba8c79e97dbcfba8ab00c39c (diff) | |
| download | bcm5719-llvm-a03feadeb2221d28fb21c847336b3ef697aaf5ff.tar.gz bcm5719-llvm-a03feadeb2221d28fb21c847336b3ef697aaf5ff.zip | |
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.
llvm-svn: 215468
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index a8f8cc397ac..f0d53ffada1 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -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}) |
