Summary: On some platforms C++ headers are packaged with the compiler not the sysroot. If you don't copy C++ headers into the build include directory during configuraiton of the outer build the C++ check during the runtime configuration may get inaccurate results.
Reviewers: phosek, compnerd, smeenai, EricWF
Reviewed By: compnerd
Subscribers: EricWF, christof, libcxx-commits, mgorny, llvm-commits
Tags: #llvm, #libc
Differential Revision: https://reviews.llvm.org/D62155
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@361513
91177308-0d34-0410-b5e6-
96231b3b80d8
# should be built with the LLVM toolchain from the build directory. This file is
# a first step to formalizing runtime build interfaces.
# should be built with the LLVM toolchain from the build directory. This file is
# a first step to formalizing runtime build interfaces.
-# In the current state this file only works with compiler-rt, other runtimes
-# will work as the runtime build interface standardizes.
+# Setting CMake minimum required version should be at the very top of the file
+# if this is the entry point.
+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+ cmake_minimum_required(VERSION 3.4.3)
+ project(Runtimes C CXX ASM)
+endif()
# Find all subdirectories containing CMake projects
file(GLOB entries *)
# Find all subdirectories containing CMake projects
file(GLOB entries *)
else() # if this is included from LLVM's CMake
include(LLVMExternalProjectUtils)
else() # if this is included from LLVM's CMake
include(LLVMExternalProjectUtils)
+ if (LLVM_EXTERNAL_LIBCXX_SOURCE_DIR)
+ set(LIBCXX_HEADER_DIR ${LLVM_INCLUDE_DIR}/c++/v1/)
+ set(CXX_HEADER_TARGET runtime-libcxx-headers)
+ add_subdirectory(${LLVM_EXTERNAL_LIBCXX_SOURCE_DIR}/include ${CXX_HEADER_TARGET})
+ endif()
if(NOT LLVM_BUILD_RUNTIMES)
set(EXTRA_ARGS EXCLUDE_FROM_ALL)
if(NOT LLVM_BUILD_RUNTIMES)
set(EXTRA_ARGS EXCLUDE_FROM_ALL)
llvm_ExternalProject_Add(runtimes
${CMAKE_CURRENT_SOURCE_DIR}
llvm_ExternalProject_Add(runtimes
${CMAKE_CURRENT_SOURCE_DIR}
+ DEPENDS ${ARG_DEPENDS} runtime-libcxx-headers
# Builtins were built separately above
CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
-DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
# Builtins were built separately above
CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
-DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
llvm_ExternalProject_Add(runtimes-${name}
${CMAKE_CURRENT_SOURCE_DIR}
llvm_ExternalProject_Add(runtimes-${name}
${CMAKE_CURRENT_SOURCE_DIR}
- DEPENDS ${${name}_deps}
+ DEPENDS ${${name}_deps} runtime-libcxx-headers
# Builtins were built separately above
CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
-DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
# Builtins were built separately above
CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
-DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}