From 228705dbb5ccc8285f885974e4b94c1f47083f41 Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Sat, 21 Nov 2020 14:27:14 +0000
Subject: [PATCH] clang: cmake: use our FLAGS

---
 clang/.signature |  4 ++--
 clang/Pkgfile    | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/clang/.signature b/clang/.signature
index 77bb48717..4fdce70fe 100644
--- a/clang/.signature
+++ b/clang/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/ViW6Q9dJtsjjzrSI0q1P4iLcpVoOriqNb6RZnPX5t5LZ2LEUmHbTldhaWflzEW9AgZHN6gii8LALISo1AB0Gwo=
-SHA256 (Pkgfile) = d7729e6438feca95fe3b33454632281cdd1aa160f7373bff9d5959bc3e4be6bd
+RWSE3ohX2g5d/Zarqjk9tmlD7IS2aeHUJ8Ig39lF9QLDPGDnPLReUlW97p3cb1xB/puowKxg1jdklGhlBzPXU67WwvsLqvCZqAQ=
+SHA256 (Pkgfile) = 6994f172473e781fe68cf0589f04c7b08cdd1c08d8afa08f995ed82439de0b0d
 SHA256 (.footprint) = cfb86615bb4dcc3688e8e6da59c2bc09b516ac30beb9c8699468624048fcca11
 SHA256 (clang-11.0.0.src.tar.xz) = 0f96acace1e8326b39f220ba19e055ba99b0ab21c2475042dbc6a482649c5209
 SHA256 (clang-tools-extra-11.0.0.src.tar.xz) = fed318f75d560d0e0ae728e2fb8abce71e9d0c60dd120c9baac118522ce76c09
diff --git a/clang/Pkgfile b/clang/Pkgfile
index 3025ae331..d59e9987f 100644
--- a/clang/Pkgfile
+++ b/clang/Pkgfile
@@ -13,13 +13,15 @@ build() {
 	mv $name-tools-extra-$version.src $name-$version.src/tools/extra
 
 	cmake -S $name-$version.src -B build -G Ninja \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DLLVM_INCLUDE_TESTS=0 \
-		-DLLVM_PARALLEL_COMPILE_JOBS="${JOBS:-1}" \
+		-D CMAKE_INSTALL_PREFIX=/usr \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG" \
+		-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG" \
+		-D LLVM_INCLUDE_TESTS=0 \
+		-D LLVM_PARALLEL_COMPILE_JOBS="${JOBS:-1}" \
 		-Wno-dev
-	ninja -C build
-	DESTDIR=$PKG ninja -C build install
+	cmake --build build
+	DESTDIR=$PKG cmake --install build
 
 	# -DCMAKE_INSTALL_LIBEXECDIR is hardcoded..
 	mv $PKG/usr/libexec/{c++-analyzer,ccc-analyzer} $PKG/usr/lib/clang