summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Tiehuis2017-10-24 18:47:35 +1300
committerMarc Tiehuis2017-10-24 18:47:35 +1300
commit1159b1adebe1e9dfea344d527e38fb4a1d54e2b4 (patch)
treefa1955fa28484bdd1609b15a0c342a568b4d9d3f
parentc6319db10de16b452eedef7c7462e96fcf5c3f90 (diff)
downloadaur-1159b1adebe1e9dfea344d527e38fb4a1d54e2b4.tar.gz
Add missing llvm linker flags
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD7
2 files changed, 7 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d66a8ade684f..ee7c7dca6a05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = zig-git
pkgdesc = a programming language prioritizing robustness, optimality, and clarity
- pkgver = 0.0.0r1594.dcc5f24
+ pkgver = 0.0.0r1795.d7e28f99
pkgrel = 1
url = http://ziglang.org
arch = i686
@@ -9,6 +9,7 @@ pkgbase = zig-git
makedepends = cmake
depends = llvm
depends = clang
+ depends = ncurses
provides = zig
conflicts = zig
source = git://github.com/zig-lang/zig.git
diff --git a/PKGBUILD b/PKGBUILD
index 7d6a48ff166d..608e76d63116 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
# Maintainer: Marc Tiehuis <marctiehuis at gmail.com>
pkgname=zig-git
-pkgver=0.0.0r1594.dcc5f24
+pkgver=0.0.0r1795.d7e28f99
pkgrel=1
pkgdesc="a programming language prioritizing robustness, optimality, and clarity"
arch=('i686' 'x86_64')
url='http://ziglang.org'
license=('MIT')
-depends=('llvm' 'clang')
+depends=('llvm' 'clang' 'ncurses')
makedepends=('cmake')
provides=(zig)
conflicts=(zig)
@@ -23,8 +23,10 @@ build() {
cd "$srcdir/$provides"
mkdir -p build
cd build
+ # llvm-config not passing appropriate linker flags so we pass explicitly
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_EXE_LINKER_FLAGS="-lcurses -ltinfo" \
-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/ .*//") \
@@ -41,6 +43,7 @@ check() {
cd build_test
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_EXE_LINKER_FLAGS="-lcurses -ltinfo" \
-DCMAKE_INSTALL_PREFIX=$(pwd) \
-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/ .*//") \