From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 14 Apr 2017 22:34:11 +0000 (+0200)
Subject: sys-devel/llvm: Fix passing -DNDEBUG to build, #614844
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4a072e71088b37888ae219b3aa0ae490938b9a5d;p=gentoo.git

sys-devel/llvm: Fix passing -DNDEBUG to build, #614844
---

diff --git a/sys-devel/llvm/llvm-4.0.0-r1.ebuild b/sys-devel/llvm/llvm-4.0.0-r2.ebuild
similarity index 98%
rename from sys-devel/llvm/llvm-4.0.0-r1.ebuild
rename to sys-devel/llvm/llvm-4.0.0-r2.ebuild
index db35674169dc..4e23b863f255 100644
--- a/sys-devel/llvm/llvm-4.0.0-r1.ebuild
+++ b/sys-devel/llvm/llvm-4.0.0-r2.ebuild
@@ -204,6 +204,8 @@ multilib_src_configure() {
 		)
 	fi
 
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 	cmake-utils_src_configure
 }
 
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 44153d7806ec..2d6aee824234 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -203,6 +203,8 @@ multilib_src_configure() {
 		)
 	fi
 
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 	cmake-utils_src_configure
 }