From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1492365-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id E48D7158030
	for <garchives@archives.gentoo.org>; Fri,  3 Mar 2023 22:04:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 3D883E07AE;
	Fri,  3 Mar 2023 22:04:21 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 25671E07AE
	for <gentoo-commits@lists.gentoo.org>; Fri,  3 Mar 2023 22:04:21 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 43732335D3C
	for <gentoo-commits@lists.gentoo.org>; Fri,  3 Mar 2023 22:04:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id D86328C7
	for <gentoo-commits@lists.gentoo.org>; Fri,  3 Mar 2023 22:04:18 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1677880967.9a317399c8b7e0568d1dcea107511373b31855dc.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/features/llvm/
X-VCS-Repository: repo/gentoo
X-VCS-Files: profiles/features/llvm/package.use profiles/features/llvm/package.use.force
X-VCS-Directories: profiles/features/llvm/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 9a317399c8b7e0568d1dcea107511373b31855dc
X-VCS-Branch: master
Date: Fri,  3 Mar 2023 22:04:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a2391a7d-1015-4395-9402-e1955a7e35ae
X-Archives-Hash: e1e14070bc4ccb96013c7ab936332c4e

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 <sam@gentoo.org> (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