diff options
| author | Petr Hosek <phosek@google.com> | 2022-11-11 22:50:14 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@google.com> | 2022-11-15 09:01:46 +0000 |
| commit | 9c2700dfa51a3f10e47f902939bbbe0a5b6b9c9b (patch) | |
| tree | 7ebf68377210261c1594d5e647ada751e527b061 | |
| parent | 1ebfe9b264bb0b7c48789748b737b8687de28639 (diff) | |
| download | llvm-9c2700dfa51a3f10e47f902939bbbe0a5b6b9c9b.tar.gz | |
[CMake][compiler-rt] Don't load LLVM config in the runtimes build
LLVM runtimes build already loads the LLVM config and sets all
appropriate variables, no need to do it again.
Differential Revision: https://reviews.llvm.org/D137870
| -rw-r--r-- | compiler-rt/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | compiler-rt/lib/builtins/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | runtimes/CMakeLists.txt | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index f6b1f1a2ee04..e43017da56da 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -79,7 +79,9 @@ if (COMPILER_RT_STANDALONE_BUILD) set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_EXTENSIONS NO) - load_llvm_config() + if (NOT LLVM_RUNTIMES_BUILD) + load_llvm_config() + endif() if (TARGET intrinsics_gen) # Loading the llvm config causes this target to be imported so place it # under the appropriate folder in an IDE. diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt index 42015ef8f36d..3eefba8c358b 100644 --- a/compiler-rt/lib/builtins/CMakeLists.txt +++ b/compiler-rt/lib/builtins/CMakeLists.txt @@ -25,7 +25,9 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) include(base-config-ix) include(CompilerRTUtils) - load_llvm_config() + if (NOT LLVM_RUNTIMES_BUILD) + load_llvm_config() + endif() construct_compiler_rt_default_triple() include(SetPlatformToolchainTools) diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt index af1e3dbb8223..3f3ef4e648c0 100644 --- a/runtimes/CMakeLists.txt +++ b/runtimes/CMakeLists.txt @@ -54,6 +54,7 @@ if (NOT LLVM_BINARY_DIR) endif() if (NOT LLVM_FOUND) set(LLVM_TOOLS_BINARY_DIR ${LLVM_BINARY_DIR}/bin) + set(LLVM_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include) set(LLVM_LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/lib) endif() |