diff options
author | Marc Tiehuis <marctiehuis@gmail.com> | 2018-04-30 17:34:15 +1200 |
---|---|---|
committer | Marc Tiehuis <marctiehuis@gmail.com> | 2018-04-30 17:34:15 +1200 |
commit | 96c48ce7aef2cfe0bac214203e5cde50f6da51e0 (patch) | |
tree | b2d91c0a468d9aaf1d3eaf094d3ccdf51d2bf480 /force_dynamic_llvm.patch | |
parent | Update to HEAD (diff) | |
download | zig-git-96c48ce7aef2cfe0bac214203e5cde50f6da51e0.tar.xz |
Update cmake build step and patch
Diffstat (limited to 'force_dynamic_llvm.patch')
-rw-r--r-- | force_dynamic_llvm.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/force_dynamic_llvm.patch b/force_dynamic_llvm.patch index a2f533c..c92f302 100644 --- a/force_dynamic_llvm.patch +++ b/force_dynamic_llvm.patch @@ -1,12 +1,12 @@ diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake -index 296e0a91..82b435af 100644 +index 021c3c6f..82b435af 100644 --- a/cmake/Findllvm.cmake +++ b/cmake/Findllvm.cmake @@ -15,7 +15,7 @@ find_program(LLVM_CONFIG_EXE "c:/msys64/mingw64/bin" "C:/Libraries/llvm-6.0.0/bin") --if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug")) +-if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug") OR ZIG_STATIC) +if(false) execute_process( COMMAND ${LLVM_CONFIG_EXE} --libfiles --link-static |