From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1217697-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 22D02138359
for <garchives@archives.gentoo.org>; Mon, 26 Oct 2020 11:50:10 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4B27AE0837;
Mon, 26 Oct 2020 11:50:08 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 32C8EE0837
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Oct 2020 11:50:07 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D361C33BE65
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Oct 2020 11:50:05 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BA183B1
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Oct 2020 11:50:04 +0000 (UTC)
From: "Fabian Groffen" <grobian@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, "Fabian Groffen" <grobian@gentoo.org>
Message-ID: <1603712949.c87ecd828f4b4de9ba80c32d3eaf19bfcfc6deea.grobian@gentoo>
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
X-VCS-Repository: repo/proj/prefix
X-VCS-Files: scripts/bootstrap-prefix.sh
X-VCS-Directories: scripts/
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: c87ecd828f4b4de9ba80c32d3eaf19bfcfc6deea
X-VCS-Branch: master
Date: Mon, 26 Oct 2020 11:50:04 +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: 0a24784a-8d5c-48fc-9980-e9d1d263a6fd
X-Archives-Hash: 0c8643eca7dfc2e236699476ebcdb2dc
commit: c87ecd828f4b4de9ba80c32d3eaf19bfcfc6deea
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 11:49:09 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 11:49:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c87ecd82
scripts/bootstrap-prefix.sh: add detection support for newer Apple clang
Thanks Alexander Bezrukov for an initial patch. I went with a slightly
different approach, to be a bit more specific and hopefully not match
something unexpected in the future.
Closes: https://bugs.gentoo.org/751067
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/bootstrap-prefix.sh | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 313139c0e8..559eb3a356 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -222,6 +222,23 @@ configure_toolchain() {
local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
local mycc=
case "${ccvers}" in
+ *"Apple clang version "*)
+ vers=${ccvers#*Apple clang version }
+ vers=${vers% (clang-*}
+ # this is Clang, recent enough to compile recent clang
+ mycc=clang
+ compiler_stage1+="
+ ${llvm_deps}
+ sys-devel/llvm
+ sys-devel/clang
+ sys-libs/libcxxabi
+ sys-libs/libcxx"
+ ;;
+ esac
+ CC=clang
+ CXX=clang++
+ linker=sys-devel/binutils-apple
+ ;;
*"Apple LLVM version "*)
vers=${ccvers#*Apple LLVM version }
vers=${vers% (clang-*}