[compiler-rt] r253064 - [CMake] [macho_embedded] [builtins] Always use OS X sysroot, even for arm.

[Chris Bieneman via llvm-commits]

Author: cbieneman
Date: Fri Nov 13 13:14:58 2015
New Revision: 253064

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

Modified:
    compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake

Modified: compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake?rev=253064&r1=253063&r2=253064&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake Fri Nov 13 13:14:58 2015
@@ -411,11 +411,8 @@ macro(darwin_add_embedded_builtin_librar
       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})