authorgravatar for quae@daurnimator.comdaurnimator <quae@daurnimator.com> 2019-07-09 19:03:57+10:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-07-16 12:33:13-04:00
log3a67c13b5db7efe28d4656d5da808f42ac026cc3
treee48245e790b81bfec05f2412d932f83119274971
parent9dcddc2249217c8c99c9d07bb0187904847d2ae2

cmake: allow user to select static vs dynamic LLVM


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

CMakeLists.txt+5
......@@ -36,6 +36,11 @@ endif()
3636message("Configuring zig version ${ZIG_VERSION}")
3737
3838set(ZIG_STATIC off CACHE BOOL "Attempt to build a static zig executable (not compatible with glibc)")
39set(ZIG_STATIC_LLVM off CACHE BOOL "Prefer linking against static LLVM libraries")
40
41if(ZIG_STATIC)
42 set(ZIG_STATIC_LLVM "on")
43endif()
3944
4045string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_LIB_DIR_ESCAPED "${ZIG_LIBC_LIB_DIR}")
4146string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_STATIC_LIB_DIR_ESCAPED "${ZIG_LIBC_STATIC_LIB_DIR}")
cmake/Findllvm.cmake+1-1
......@@ -65,7 +65,7 @@ NEED_TARGET("WebAssembly")
6565NEED_TARGET("X86")
6666NEED_TARGET("XCore")
6767
68if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug") OR ZIG_STATIC)
68if(ZIG_STATIC_LLVM)
6969 execute_process(
7070 COMMAND ${LLVM_CONFIG_EXE} --libfiles --link-static
7171 OUTPUT_VARIABLE LLVM_LIBRARIES_SPACES