commit:     b2b3862f1e814bf4634cbd0706174c6b57c8aa0e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  2 11:47:52 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct  3 06:04:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2b3862f

sys-libs/compiler-rt-sanitizers: Ensure NDEBUG correctly

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild | 5 ++++-
 sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild | 5 ++++-
 .../compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild
index 86e4d10a7c7..fdf1c53a966 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/";
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
 KEYWORDS=""
-IUSE="+clang test elibc_glibc"
+IUSE="+clang debug test elibc_glibc"
 # base targets
 IUSE+=" +libfuzzer +memprof +orc +profile +xray"
 # sanitizer targets, keep in sync with config-ix.cmake
@@ -97,6 +97,9 @@ src_prepare() {
 }
 
 src_configure() {
+       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
        # pre-set since we need to pass it to cmake
        BUILD_DIR=${WORKDIR}/compiler-rt_build
 

diff --git 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild
index 748cbd21f40..b70b3695c1f 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/";
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos 
~x64-macos"
-IUSE="+clang test elibc_glibc"
+IUSE="+clang debug test elibc_glibc"
 # base targets
 IUSE+=" +libfuzzer +memprof +orc +profile +xray"
 # sanitizer targets, keep in sync with config-ix.cmake
@@ -97,6 +97,9 @@ src_prepare() {
 }
 
 src_configure() {
+       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
        # pre-set since we need to pass it to cmake
        BUILD_DIR=${WORKDIR}/compiler-rt_build
 

diff --git 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
index 86e4d10a7c7..fdf1c53a966 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/";
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
 KEYWORDS=""
-IUSE="+clang test elibc_glibc"
+IUSE="+clang debug test elibc_glibc"
 # base targets
 IUSE+=" +libfuzzer +memprof +orc +profile +xray"
 # sanitizer targets, keep in sync with config-ix.cmake
@@ -97,6 +97,9 @@ src_prepare() {
 }
 
 src_configure() {
+       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
        # pre-set since we need to pass it to cmake
        BUILD_DIR=${WORKDIR}/compiler-rt_build
 

Reply via email to