Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt-sanitizers/
Date: Tue, 07 May 2019 13:40:33
Message-Id: 1557236406.c3b0e8e3797d70fa079038748bc49983dada5c83.mgorny@gentoo
1 commit: c3b0e8e3797d70fa079038748bc49983dada5c83
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 7 13:40:06 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue May 7 13:40:06 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3b0e8e3
7
8 sys-libs/compiler-rt-sanitizers: Disable building CRT
9
10 Disable building CRT -- let sys-libs/compiler-rt install it. This
11 should solve file collisions between the two packages.
12
13 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
14
15 sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild | 3 ++-
16 1 file changed, 2 insertions(+), 1 deletion(-)
17
18 diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
19 index 2247b480c7d..61271f31abe 100644
20 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
21 +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
22 @@ -103,8 +103,9 @@ src_configure() {
23 -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
24
25 -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
26 - # built-ins installed by sys-libs/compiler-rt
27 + # builtins & crt installed by sys-libs/compiler-rt
28 -DCOMPILER_RT_BUILD_BUILTINS=OFF
29 + -DCOMPILER_RT_BUILD_CRT=OFF
30 -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
31 -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
32 -DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)