[llvm] r300260 - [CMake][runtimes] Use -nodefaultlibs for the runtimes build

Petr Hosek via llvm-commits llvm-commits at lists.llvm.org
Thu Apr 13 14:29:03 PDT 2017


Author: phosek
Date: Thu Apr 13 16:29:03 2017
New Revision: 300260

URL: http://llvm.org/viewvc/llvm-project?rev=300260&view=rev
Log:
[CMake][runtimes] Use -nodefaultlibs for the runtimes build

We may not have a working C++ standard library at this point so we
shouldn't rely on it when running CMake checks.

Differential Revision: https://reviews.llvm.org/D31942

Modified:
    llvm/trunk/runtimes/CMakeLists.txt

Modified: llvm/trunk/runtimes/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/runtimes/CMakeLists.txt?rev=300260&r1=300259&r2=300260&view=diff
==============================================================================
--- llvm/trunk/runtimes/CMakeLists.txt (original)
+++ llvm/trunk/runtimes/CMakeLists.txt Thu Apr 13 16:29:03 2017
@@ -29,7 +29,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_
   # CMake module path.
   list(INSERT CMAKE_MODULE_PATH 0
     "${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules"
     "${LLVM_BINARY_DIR}/lib/cmake/llvm"
   )
 
@@ -65,10 +65,28 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_
    set(LLVM_ENABLE_LIBCXX ON CACHE BOOL "")
   endif()
 
+  set(SAFE_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
+  set(SAFE_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
+
+  include(CheckLibraryExists)
+  include(CheckCCompilerFlag)
+
+  check_library_exists(c fopen "" LLVM_HAS_C_LIB)
+  check_c_compiler_flag(-nodefaultlibs LLVM_HAS_NODEFAULTLIBS_FLAG)
+  if(LLVM_HAS_NODEFAULTLIBS_FLAG)
+    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -nodefaultlibs")
+    if(LLVM_HAS_C_LIB)
+      list(APPEND CMAKE_REQUIRED_LIBRARIES c)
+    endif()
+  endif()
+
   # Handle common options used by all runtimes.
   include(AddLLVM)
   include(HandleLLVMOptions)
 
+  set(CMAKE_REQUIRED_FLAGS ${SAFE_CMAKE_REQUIRED_FLAGS})
+  set(CMAKE_REQUIRED_LIBRARIES ${SAFE_CMAKE_REQUIRED_LIBRARIES})
+
   foreach(entry ${runtimes})
     get_filename_component(projName ${entry} NAME)
 




More information about the llvm-commits mailing list