diff options
| author | Chris Bieneman <beanz@apple.com> | 2015-11-10 00:31:22 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2015-11-10 00:31:22 +0000 |
| commit | be818b4c4105f73982e717ee51f36beae1c09def (patch) | |
| tree | a3a242c4599bcae16d3762e0508d833b75a657bb /cmake/Modules/CompilerRTDarwinUtils.cmake | |
| parent | 002145ed94af3287ef5006a653c26eaa90dac1dc (diff) | |
Revert "[CMake] [macho_embedded] Check to make sure the compiler supports the architectures before generating build targets"
This commit reverts r252525. I was not really thinking about this fix properly. This doesn't work because it relys on try_compile checks which do a full compile & link. I'm going to put in a temporary solution as an interm step until we have a way to perform compiler checks without linking.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@252569 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/Modules/CompilerRTDarwinUtils.cmake')
| -rw-r--r-- | cmake/Modules/CompilerRTDarwinUtils.cmake | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake index 3706298ef..c4e2e011c 100644 --- a/cmake/Modules/CompilerRTDarwinUtils.cmake +++ b/cmake/Modules/CompilerRTDarwinUtils.cmake @@ -364,19 +364,7 @@ function(darwin_add_embedded_builtin_libraries) set(PIC_FLAG -fPIC) set(STATIC_FLAG -static) - darwin_test_archs(ios - DARWIN_macho_embedded_ios_ARCHS - armv6m armv7m armv7em armv7) - darwin_test_archs(osx - DARWIN_macho_embedded_osx_ARCHS - i386 x86_64) - - list(APPEND DARWIN_macho_embedded_ARCHS - ${DARWIN_macho_embedded_ios_ARCHS} ${DARWIN_macho_embedded_osx_ARCHS}) - - if(NOT DARWIN_macho_embedded_ARCHS) - return() - endif() + set(DARWIN_macho_embedded_ARCHS armv6m armv7m armv7em armv7 i386 x86_64) set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) |