[compiler-rt] r273505 - [CMake] Converting darwin_test_archs simple source to C

Chris Bieneman via llvm-commits llvm-commits at lists.llvm.org
Wed Jun 22 16:02:50 PDT 2016


Author: cbieneman
Date: Wed Jun 22 18:02:49 2016
New Revision: 273505

URL: http://llvm.org/viewvc/llvm-project?rev=273505&view=rev
Log:
[CMake] Converting darwin_test_archs simple source to C

Using C instead of CXX here removes a configuration-time dependency on libcxx for the sanitizers. This should be NFC.

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=273505&r1=273504&r2=273505&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake Wed Jun 22 18:02:49 2016
@@ -58,8 +58,8 @@ function(darwin_test_archs os valid_arch
   set(archs ${ARGN})
   if(NOT TEST_COMPILE_ONLY)
     message(STATUS "Finding valid architectures for ${os}...")
-    set(SIMPLE_CPP ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/src.cpp)
-    file(WRITE ${SIMPLE_CPP} "#include <iostream>\nint main() { std::cout << std::endl; return 0; }\n")
+    set(SIMPLE_C ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/src.c)
+    file(WRITE ${SIMPLE_C} "#include <stdio.h>\nint main() { printf(__FILE__); return 0; }\n")
   
     set(os_linker_flags)
     foreach(flag ${DARWIN_${os}_LINKFLAGS})
@@ -81,7 +81,7 @@ function(darwin_test_archs os valid_arch
     if(TEST_COMPILE_ONLY)
       try_compile_only(CAN_TARGET_${os}_${arch} -v -arch ${arch} ${DARWIN_${os}_CFLAGS})
     else()
-      try_compile(CAN_TARGET_${os}_${arch} ${CMAKE_BINARY_DIR} ${SIMPLE_CPP}
+      try_compile(CAN_TARGET_${os}_${arch} ${CMAKE_BINARY_DIR} ${SIMPLE_C}
                   COMPILE_DEFINITIONS "-v -arch ${arch}" ${DARWIN_${os}_CFLAGS}
                   CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS=${arch_linker_flags}"
                   OUTPUT_VARIABLE TEST_OUTPUT)




More information about the llvm-commits mailing list