commit:     9a317399c8b7e0568d1dcea107511373b31855dc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  3 22:02:43 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar  3 22:02:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a317399

profiles/features/llvm: move some package.use entries to package.use.force

default-libcxx in particular cannot be toggled at-will as it changes ABI
(libstdc++ and libcxx cannot be intermixed).

We may in future want to add LLVM profiles using libstdc++ but then GCC
will be required.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/features/llvm/package.use       |  2 --
 profiles/features/llvm/package.use.force | 10 ++++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/profiles/features/llvm/package.use 
b/profiles/features/llvm/package.use
index 267fafefe792..5e1bbab42414 100644
--- a/profiles/features/llvm/package.use
+++ b/profiles/features/llvm/package.use
@@ -2,8 +2,6 @@
 sys-devel/llvm -binutils-plugin
 
 # use all defaults
-sys-devel/clang default-compiler-rt default-lld default-libcxx llvm-libunwind
-sys-devel/clang-common default-compiler-rt default-lld default-libcxx 
llvm-libunwind
 sys-libs/compiler-rt clang
 
 # disable sanitizers for now

diff --git a/profiles/features/llvm/package.use.force 
b/profiles/features/llvm/package.use.force
new file mode 100644
index 000000000000..669f1f86ad87
--- /dev/null
+++ b/profiles/features/llvm/package.use.force
@@ -0,0 +1,10 @@
+# Copyright 2023 Gentoo Authors                                                
 
+# Distributed under the terms of the GNU General Public License v2 
+
+# Sam James <[email protected]> (2023-03-03)
+# Force the toolchain environment we expect on the LLVM profiles.
+# default-libcxx in particular changes ABI so can't be toggled at-will, and 
other
+# profile settings expect it.
+# TODO: Make a profile without default-libcxx too?
+sys-devel/clang default-compiler-rt default-lld default-libcxx
+sys-devel/clang-common default-compiler-rt default-lld default-libcxx

Reply via email to