summaryrefslogtreecommitdiff
path: root/cmake/Modules
diff options
context:
space:
mode:
authorChris Bieneman <beanz@apple.com>2015-11-13 19:14:58 +0000
committerChris Bieneman <beanz@apple.com>2015-11-13 19:14:58 +0000
commit9ef63e2084483ac9865fe45231ee5b8053b151a2 (patch)
treed3597894cf64d58dfecfec0a7091d671c2544a25 /cmake/Modules
parentcc7c3719214c6ead7807509141c8126bc2c52737 (diff)
[CMake] [macho_embedded] [builtins] Always use OS X sysroot, even for arm.
Turns out that there are some checks in the backend that change code generation for armv7 if you are building against an iOS sys root. For the macho_embedded builtins we really don't want that. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@253064 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/Modules')
-rw-r--r--cmake/Modules/CompilerRTDarwinUtils.cmake3
1 files changed, 0 insertions, 3 deletions
diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake
index 52f89fd1f..f2fbf3866 100644
--- a/cmake/Modules/CompilerRTDarwinUtils.cmake
+++ b/cmake/Modules/CompilerRTDarwinUtils.cmake
@@ -411,11 +411,8 @@ macro(darwin_add_embedded_builtin_libraries)
string(TOLOWER "${float_type}_${type}" lib_suffix)
foreach(arch ${DARWIN_${float_type}_FLOAT_ARCHS})
set(DARWIN_macho_embedded_SYSROOT ${DARWIN_osx_SYSROOT})
- set(DARWIN_macho_embedded_BUILTIN_MIN_VER_FLAG ${DARWIN_osx_BUILTIN_MIN_VER_FLAG})
set(float_flag)
if(${arch} MATCHES "^arm")
- set(DARWIN_macho_embedded_SYSROOT ${DARWIN_ios_SYSROOT})
- set(DARWIN_macho_embedded_BUILTIN_MIN_VER_FLAG ${DARWIN_ios_BUILTIN_MIN_VER_FLAG})
# x86 targets are hard float by default, but the complain about the
# float ABI flag, so don't pass it unless we're targeting arm.
set(float_flag ${${float_type}_FLOAT_FLAG})