Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/features/llvm/
Date: Fri, 03 Mar 2023 22:04:21
Message-Id: 1677880967.9a317399c8b7e0568d1dcea107511373b31855dc.sam@gentoo
1 commit: 9a317399c8b7e0568d1dcea107511373b31855dc
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 3 22:02:43 2023 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 3 22:02:47 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a317399
7
8 profiles/features/llvm: move some package.use entries to package.use.force
9
10 default-libcxx in particular cannot be toggled at-will as it changes ABI
11 (libstdc++ and libcxx cannot be intermixed).
12
13 We may in future want to add LLVM profiles using libstdc++ but then GCC
14 will be required.
15
16 Signed-off-by: Sam James <sam <AT> gentoo.org>
17
18 profiles/features/llvm/package.use | 2 --
19 profiles/features/llvm/package.use.force | 10 ++++++++++
20 2 files changed, 10 insertions(+), 2 deletions(-)
21
22 diff --git a/profiles/features/llvm/package.use b/profiles/features/llvm/package.use
23 index 267fafefe792..5e1bbab42414 100644
24 --- a/profiles/features/llvm/package.use
25 +++ b/profiles/features/llvm/package.use
26 @@ -2,8 +2,6 @@
27 sys-devel/llvm -binutils-plugin
28
29 # use all defaults
30 -sys-devel/clang default-compiler-rt default-lld default-libcxx llvm-libunwind
31 -sys-devel/clang-common default-compiler-rt default-lld default-libcxx llvm-libunwind
32 sys-libs/compiler-rt clang
33
34 # disable sanitizers for now
35
36 diff --git a/profiles/features/llvm/package.use.force b/profiles/features/llvm/package.use.force
37 new file mode 100644
38 index 000000000000..669f1f86ad87
39 --- /dev/null
40 +++ b/profiles/features/llvm/package.use.force
41 @@ -0,0 +1,10 @@
42 +# Copyright 2023 Gentoo Authors
43 +# Distributed under the terms of the GNU General Public License v2
44 +
45 +# Sam James <sam@g.o> (2023-03-03)
46 +# Force the toolchain environment we expect on the LLVM profiles.
47 +# default-libcxx in particular changes ABI so can't be toggled at-will, and other
48 +# profile settings expect it.
49 +# TODO: Make a profile without default-libcxx too?
50 +sys-devel/clang default-compiler-rt default-lld default-libcxx
51 +sys-devel/clang-common default-compiler-rt default-lld default-libcxx