| author |  daurnimator <quae@daurnimator.com> 2019-07-09 19:03:57+10:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2019-07-16 12:33:13-04:00 |
| log | 3a67c13b5db7efe28d4656d5da808f42ac026cc3 |
| tree | e48245e790b81bfec05f2412d932f83119274971 |
| parent | 9dcddc2249217c8c99c9d07bb0187904847d2ae2 |
cmake: allow user to select static vs dynamic LLVM
2 files changed, 6 insertions(+), 1 deletions(-)
CMakeLists.txt+5
| ... | @@ -36,6 +36,11 @@ endif() | ... | @@ -36,6 +36,11 @@ endif() |
| 36 | message("Configuring zig version ${ZIG_VERSION}") | 36 | message("Configuring zig version ${ZIG_VERSION}") |
| 37 | 37 | ||
| 38 | set(ZIG_STATIC off CACHE BOOL "Attempt to build a static zig executable (not compatible with glibc)") | 38 | set(ZIG_STATIC off CACHE BOOL "Attempt to build a static zig executable (not compatible with glibc)") |
| 39 | set(ZIG_STATIC_LLVM off CACHE BOOL "Prefer linking against static LLVM libraries") | ||
| 40 | |||
| 41 | if(ZIG_STATIC) | ||
| 42 | set(ZIG_STATIC_LLVM "on") | ||
| 43 | endif() | ||
| 39 | 44 | ||
| 40 | string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_LIB_DIR_ESCAPED "${ZIG_LIBC_LIB_DIR}") | 45 | string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_LIB_DIR_ESCAPED "${ZIG_LIBC_LIB_DIR}") |
| 41 | string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_STATIC_LIB_DIR_ESCAPED "${ZIG_LIBC_STATIC_LIB_DIR}") | 46 | string(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") | ... | @@ -65,7 +65,7 @@ NEED_TARGET("WebAssembly") |
| 65 | NEED_TARGET("X86") | 65 | NEED_TARGET("X86") |
| 66 | NEED_TARGET("XCore") | 66 | NEED_TARGET("XCore") |
| 67 | 67 | ||
| 68 | if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug") OR ZIG_STATIC) | 68 | if(ZIG_STATIC_LLVM) |
| 69 | execute_process( | 69 | execute_process( |
| 70 | COMMAND ${LLVM_CONFIG_EXE} --libfiles --link-static | 70 | COMMAND ${LLVM_CONFIG_EXE} --libfiles --link-static |
| 71 | OUTPUT_VARIABLE LLVM_LIBRARIES_SPACES | 71 | OUTPUT_VARIABLE LLVM_LIBRARIES_SPACES |