zig

commit 4e9894cfc4c8e2e1d3e01aa2e3400b295b0ee2df (tree)
parent cc650abf09d98ff241cc28b50b2519a9c4919dd0
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Sat, 13 Mar 2021 14:30:56 -0700

cmake build: allow overriding whether to use llvm-config

Previously, there was an option ZIG_PREFER_LLVM_CONFIG which would
override the default of not using llvm-config when cross compiling.

That option is now removed in favor of the more powerful
ZIG_USE_LLVM_CONFIG which defaults to OFF for cross compiling and ON for
native compilation. The option overrides the default.

This will be used in zig-bootstrap to improve support for native builds.

Diffstat:
M
CMakeLists.txt
 | 
7
++++++-
M
cmake/Findllvm.cmake
 | 
2
+-

2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -87,10 +87,15 @@ 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")
 set(ZIG_SINGLE_THREADED off CACHE BOOL "limit the zig compiler to use only 1 thread")
 set(ZIG_OMIT_STAGE2 off CACHE BOOL "omit the stage2 backend from stage1")
 
+if("${ZIG_TARGET_TRIPLE}" STREQUAL "native")
+    set(ZIG_USE_LLVM_CONFIG ON CACHE BOOL "use llvm-config to find LLVM libraries")
+else()
+    set(ZIG_USE_LLVM_CONFIG OFF CACHE BOOL "use llvm-config to find LLVM libraries")
+endif()
+
 find_package(llvm)
 find_package(clang)
 find_package(lld)
diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake
@@ -63,7 +63,7 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)
   if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 12)
     message(FATAL_ERROR "expected LLVM 11.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
   endif()
-elseif(("${ZIG_TARGET_TRIPLE}" STREQUAL "native") OR ZIG_PREFER_LLVM_CONFIG)
+elseif(ZIG_USE_LLVM_CONFIG)
   find_program(LLVM_CONFIG_EXE
       NAMES llvm-config-11 llvm-config-11.0 llvm-config110 llvm-config11 llvm-config
       PATHS