diff --git a/CMakeLists.txt b/CMakeLists.txt index 63ac2b999e..a3c7f9057c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,6 +74,7 @@ option(ZIG_TEST_COVERAGE "Build Zig with test coverage instrumentation" OFF) set(ZIG_TARGET_TRIPLE "native" CACHE STRING "arch-os-abi to output binaries for") set(ZIG_TARGET_MCPU "baseline" CACHE STRING "-mcpu parameter to output binaries for") set(ZIG_EXECUTABLE "" CACHE STRING "(when cross compiling) path to already-built zig binary") +set(ZIG_PREFER_LLVM_CONFIG off CACHE BOOL "(when cross compiling) use llvm-config to find target llvm dependencies if needed") find_package(llvm) find_package(clang) diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake index 59d8e1352b..de7db6d58a 100644 --- a/cmake/Findllvm.cmake +++ b/cmake/Findllvm.cmake @@ -32,7 +32,7 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB) /usr/local/llvm10/lib /usr/local/llvm100/lib ) -elseif("${ZIG_TARGET_TRIPLE}" STREQUAL "native") +elseif(("${ZIG_TARGET_TRIPLE}" STREQUAL "native") OR ZIG_PREFER_LLVM_CONFIG) find_program(LLVM_CONFIG_EXE NAMES llvm-config-10 llvm-config-10.0 llvm-config100 llvm-config10 llvm-config PATHS