From 29fefe2d3ef94a17c79be4852ed50c8e9ffad74c Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Sun, 24 Apr 2022 12:44:19 -0600 Subject: [PATCH] Toolchain: Explicitly install llvm-config and FileCheck Also disable the "toolchain only build" to ensure we install llvm headers for when we want to build host tools that link against llvm. --- Toolchain/CMake/LLVMConfig.cmake | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Toolchain/CMake/LLVMConfig.cmake b/Toolchain/CMake/LLVMConfig.cmake index e408bd3f03..d77fef2e69 100644 --- a/Toolchain/CMake/LLVMConfig.cmake +++ b/Toolchain/CMake/LLVMConfig.cmake @@ -14,12 +14,12 @@ set(LLVM_ENABLE_RUNTIMES "compiler-rt" CACHE STRING "") set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR ON CACHE BOOL "") set(LLVM_ENABLE_BINDINGS OFF CACHE BOOL "") set(LLVM_INCLUDE_BENCHMARKS OFF CACHE BOOL "") -set(LLVM_BUILD_UTILS OFF CACHE BOOL "") +set(LLVM_BUILD_UTILS ON CACHE BOOL "") set(LLVM_INCLUDE_TESTS OFF CACHE BOOL "") set(LLVM_BUILD_LLVM_DYLIB ON CACHE BOOL "") set(LLVM_LINK_LLVM_DYLIB ON CACHE BOOL "") -set(LLVM_INSTALL_UTILS OFF CACHE BOOL "") -set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") +set(LLVM_INSTALL_UTILS ON CACHE BOOL "") +set(LLVM_INSTALL_TOOLCHAIN_ONLY OFF CACHE BOOL "Don't install headers, utils, and tools") set(LLVM_INSTALL_BINUTILS_SYMLINKS OFF CACHE BOOL "") set(CLANG_ENABLE_CLANGD OFF CACHE BOOL "") @@ -56,6 +56,7 @@ endforeach() set(LLVM_TOOLCHAIN_TOOLS llvm-addr2line llvm-ar + llvm-config llvm-cov llvm-cxxfilt llvm-dwarfdump @@ -75,5 +76,10 @@ set(LLVM_TOOLCHAIN_TOOLS llvm-symbolizer CACHE STRING "") +set(LLVM_TOOLCHAIN_UTILITIES + FileCheck + CACHE STRING "" +) + set(LLVM_RUNTIME_TARGETS ${targets} CACHE STRING "") set(LLVM_BUILTIN_TARGETS ${targets} CACHE STRING "")