users should validate NINJAFLAGS value, not PKGBUILD

2 files changed, 9 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e44c221a6ddd..4647f8613686 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = lib32-llvm-minimal-git
-	pkgver = 9.0.0_r317360.3e8b9d4a57c
+	pkgver = 9.0.0_r317455.ae4ec62cc9a
 	pkgrel = 1
 	url = http://llvm.org/
 	arch = x86_64
@@ -18,9 +18,9 @@ pkgbase = lib32-llvm-minimal-git
 
 pkgname = lib32-llvm-minimal-git
 	pkgdesc = Collection of modular and reusable compiler and toolchain technologies (32-bit)
-	depends = lib32-llvm-libs-minimal-git=9.0.0_r317360.3e8b9d4a57c-1
+	depends = lib32-llvm-libs-minimal-git=9.0.0_r317455.ae4ec62cc9a-1
 	depends = llvm-minimal-git
-	provides = lib32-llvm=9.0.0_r317360.3e8b9d4a57c-1
+	provides = lib32-llvm=9.0.0_r317455.ae4ec62cc9a-1
 	provides = lone_wolf-lib32-llvm-git
 	conflicts = lib32-llvm
 	replaces = lone_wolf-lib32-llvm-git
@@ -33,6 +33,6 @@ pkgname = lib32-llvm-libs-minimal-git
 	depends = lib32-libxml2
 	depends = lib32-gcc-libs
 	optdepends = lib32-llvm-libs: for LLVMgold linker
-	provides = lone_wolf-lib32-llvm-libs-git=9.0.0_r317360.3e8b9d4a57c-1
+	provides = lone_wolf-lib32-llvm-libs-git=9.0.0_r317455.ae4ec62cc9a-1
 	replaces = lone_wolf-lib32-llvm-libs-git
 
diff --git a/PKGBUILD b/PKGBUILD
index fcb7ecea2c7a..1e86ca6860ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@
 
 pkgbase=lib32-llvm-minimal-git
 pkgname=('lib32-llvm-minimal-git' 'lib32-llvm-libs-minimal-git')
-pkgver=9.0.0_r317360.3e8b9d4a57c
+pkgver=9.0.0_r317455.ae4ec62cc9a
 pkgrel=1
 arch=('x86_64')
 url="http://llvm.org/"
@@ -30,6 +30,9 @@ source=("llvm-project::git+https://github.com/llvm/llvm-project.git")
 md5sums=('SKIP')
 sha512sums=('SKIP')
 
+# NINJAFLAGS is an env var used to pass commandline options to ninja
+# NOTE: It's your responbility to validate the value of $NINJAFLAGS. If unsure, don't set it.
+
 pkgver() {
     cd llvm-project/llvm
 
@@ -85,11 +88,7 @@ build() {
         -D LLVM_VERSION_SUFFIX="" \
         -D LLVM_ENABLE_BINDINGS=OFF
         
-    if [[ ! $NINJAFLAGS ]]; then
-        ninja
-    else
         ninja "$NINJAFLAGS"
-    fi
 }
 
 package_lib32-llvm-minimal-git() {
@@ -100,7 +99,7 @@ package_lib32-llvm-minimal-git() {
     replaces=(lone_wolf-lib32-llvm-git)
     
     cd _build
-    DESTDIR="$pkgdir" ninja install
+    DESTDIR="$pkgdir" ninja "$NINJAFLAGS" install
 
     # Remove files which conflict with lib32-llvm-libs
     rm "$pkgdir"/usr/lib32/{LLVMgold,lib{LLVM,LTO}}.so