From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 A35341382C5 for ; Thu, 31 Dec 2020 18:36:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE03DE07FE; Thu, 31 Dec 2020 18:36:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 A4775E07FE for ; Thu, 31 Dec 2020 18:36:38 +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 39456340A7B for ; Thu, 31 Dec 2020 18:36:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B673A53 for ; Thu, 31 Dec 2020 18:36:35 +0000 (UTC) From: "Fabian Groffen" 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" Message-ID: <1609439764.4e6bc8b4d40885216cef434386f30ab95f43ff53.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: 4e6bc8b4d40885216cef434386f30ab95f43ff53 X-VCS-Branch: master Date: Thu, 31 Dec 2020 18:36:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9f9613e0-5f91-4f7e-99f0-65deacdf2ede X-Archives-Hash: 38e668c187c7024e1c61fcbf8a96b685 commit: 4e6bc8b4d40885216cef434386f30ab95f43ff53 Author: Fabian Groffen gentoo org> AuthorDate: Thu Dec 31 18:36:04 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Dec 31 18:36:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4e6bc8b4 scripts/bootstrap-prefix: drop obsolete Darwin code paths Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 66 ++------------------------------------------- 1 file changed, 2 insertions(+), 64 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 8dae1b5944..c383f0f11a 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -224,14 +224,10 @@ configure_toolchain() { compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu" compiler_type="clang" local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )" - local mycc= local llvm_deps="dev-util/ninja sys-devel/gnuconfig" case "${ccvers}" in - *"Apple clang version "*) - vers=${ccvers#*Apple clang version } - vers=${vers% (clang-*} + *"Apple clang version "*|*"Apple LLVM version "*) # this is Clang, recent enough to compile recent clang - mycc=clang compiler_stage1+=" ${llvm_deps} sys-libs/libcxxabi @@ -247,57 +243,12 @@ configure_toolchain() { # from system set linker=sys-devel/native-cctools ;; - *"Apple LLVM version "*) - vers=${ccvers#*Apple LLVM version } - vers=${vers% (clang-*} - # let's assume that >=llvm-3.6 is able to compile - # libcxx, so select the matching Apple versions, see - # https://gist.github.com/yamaya/2924292 - case ${vers} in - [345]"."*|"6.0"*) - # bleh, old (3.5) - # we always have to bootstrap with 3.4 for else we'd need - # libcxx, which only compiles with clang - local cdep="3.5.9999" - compiler_stage1+=" - dev-libs/libffi -