[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/

[Michał Górny]

commit:     4a072e71088b37888ae219b3aa0ae490938b9a5d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 14 22:34:11 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 22:38:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a072e71

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

 sys-devel/llvm/{llvm-4.0.0-r1.ebuild => llvm-4.0.0-r2.ebuild} | 2 ++
 sys-devel/llvm/llvm-9999.ebuild                               | 2 ++
 2 files changed, 4 insertions(+)

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 db35674169d..4e23b863f25 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 44153d7806e..2d6aee82423 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
 }