authorgravatar for jsullivan@csumb.eduJohn Sullivan <jsullivan@csumb.edu> 2020-09-20 14:55:43-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-10-04 00:41:32-04:00
logab7ea5354101ffaf5c9708ca6398ff7b765b781f
tree70ec72cf93617477b95b5f1140d7e531dacd4271
parent52ba2c3a43a88a4db30cff47f2f3eff8c3d5be19

cmake: add option to use llvm-config to find cross-target llvm deps

2 files changed, 2 insertions(+), 1 deletions(-)

CMakeLists.txt+1
...@@ -74,6 +74,7 @@ option(ZIG_TEST_COVERAGE "Build Zig with test coverage instrumentation" OFF)...@@ -74,6 +74,7 @@ option(ZIG_TEST_COVERAGE "Build Zig with test coverage instrumentation" OFF)
74set(ZIG_TARGET_TRIPLE "native" CACHE STRING "arch-os-abi to output binaries for")74set(ZIG_TARGET_TRIPLE "native" CACHE STRING "arch-os-abi to output binaries for")
75set(ZIG_TARGET_MCPU "baseline" CACHE STRING "-mcpu parameter to output binaries for")75set(ZIG_TARGET_MCPU "baseline" CACHE STRING "-mcpu parameter to output binaries for")
76set(ZIG_EXECUTABLE "" CACHE STRING "(when cross compiling) path to already-built zig binary")76set(ZIG_EXECUTABLE "" CACHE STRING "(when cross compiling) path to already-built zig binary")
77set(ZIG_PREFER_LLVM_CONFIG off CACHE BOOL "(when cross compiling) use llvm-config to find target llvm dependencies if needed")
7778
78find_package(llvm)79find_package(llvm)
79find_package(clang)80find_package(clang)
cmake/Findllvm.cmake+1-1
...@@ -32,7 +32,7 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)...@@ -32,7 +32,7 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)
32 /usr/local/llvm10/lib32 /usr/local/llvm10/lib
33 /usr/local/llvm100/lib33 /usr/local/llvm100/lib
34 )34 )
35elseif("${ZIG_TARGET_TRIPLE}" STREQUAL "native")35elseif(("${ZIG_TARGET_TRIPLE}" STREQUAL "native") OR ZIG_PREFER_LLVM_CONFIG)
36 find_program(LLVM_CONFIG_EXE36 find_program(LLVM_CONFIG_EXE
37 NAMES llvm-config-10 llvm-config-10.0 llvm-config100 llvm-config10 llvm-config37 NAMES llvm-config-10 llvm-config-10.0 llvm-config100 llvm-config10 llvm-config
38 PATHS38 PATHS