diff options
| author | Marc Tiehuis | 2018-04-30 17:34:15 +1200 |
|---|---|---|
| committer | Marc Tiehuis | 2018-04-30 17:34:15 +1200 |
| commit | 96c48ce7aef2cfe0bac214203e5cde50f6da51e0 (patch) | |
| tree | b2d91c0a468d9aaf1d3eaf094d3ccdf51d2bf480 | |
| parent | a856ef9fea0d608227922d8b614a4a1fbd280628 (diff) | |
| download | aur-96c48ce7aef2cfe0bac214203e5cde50f6da51e0.tar.gz | |
Update cmake build step and patch
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | force_dynamic_llvm.patch | 4 |
3 files changed, 5 insertions, 10 deletions
@@ -1,6 +1,6 @@ pkgbase = zig-git pkgdesc = a programming language prioritizing robustness, optimality, and clarity - pkgver = 0.2.0r2479.5b00dee0 + pkgver = 0.2.0r2735.4e23fb7f pkgrel = 1 url = http://ziglang.org arch = i686 @@ -1,7 +1,7 @@ # Maintainer: Marc Tiehuis <marctiehuis at gmail.com> pkgname=zig-git -pkgver=0.2.0r2479.5b00dee0 +pkgver=0.2.0r2735.4e23fb7f pkgrel=1 pkgdesc="a programming language prioritizing robustness, optimality, and clarity" arch=('i686' 'x86_64') @@ -28,12 +28,7 @@ build() { cd "$srcdir/$provides" mkdir -p build cd build - cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DZIG_LIBC_LIB_DIR=$(dirname $(cc -print-file-name=crt1.o)) \ - -DZIG_LIBC_INCLUDE_DIR=$(echo -n | cc -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2- | sed "s/ .*//") \ - -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $(cc -print-file-name=crtbegin.o)) + cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/force_dynamic_llvm.patch b/force_dynamic_llvm.patch index a2f533c83ad8..c92f302e5b70 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 |