[compiler-rt] r252569 - Revert "[CMake] [macho_embedded] Check to make sure the compiler supports the architectures before generating build targets"
Chris Bieneman via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 9 16:31:22 PST 2015
Author: cbieneman
Date: Mon Nov 9 18:31:22 2015
New Revision: 252569
URL: http://llvm.org/viewvc/llvm-project?rev=252569&view=rev
Log:
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.
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=252569&r1=252568&r2=252569&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake Mon Nov 9 18:31:22 2015
@@ -364,19 +364,7 @@ function(darwin_add_embedded_builtin_lib
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)
More information about the llvm-commits
mailing list