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.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 4CE4C158086 for ; Thu, 30 Dec 2021 12:29:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E1A82BC07D; Thu, 30 Dec 2021 12:29:44 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 506592BC07D for ; Thu, 30 Dec 2021 12:29:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98F4E343097 for ; Thu, 30 Dec 2021 12:29:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D71D1C6 for ; Thu, 30 Dec 2021 12:29:39 +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: <1640867377.10324f2bc1807469a6425e308c9564ed8513f2fe.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: 10324f2bc1807469a6425e308c9564ed8513f2fe X-VCS-Branch: master Date: Thu, 30 Dec 2021 12:29:39 +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: c5472783-dde9-4fbd-88cc-63f41439ffd0 X-Archives-Hash: aa3288ad33da45bfbce0680fc9520d90 commit: 10324f2bc1807469a6425e308c9564ed8513f2fe Author: Fabian Groffen gentoo org> AuthorDate: Thu Dec 30 12:27:02 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Dec 30 12:29:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=10324f2b scripts/bootstrap-prefix: darwin-gcc: use gcc-10 with host gcc GCC-11 needs C++11, which is at earliest in GCC-4.8, but if we bootstrap from 4.2.1 (gcc-apple) we don't have this, so stick with GCC-10. Avoid upgrading immediately to 11 afterwards, because we'll recompile everything lateron again. Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 70599da63a..233f606caf 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -190,9 +190,11 @@ configure_toolchain() { einfo "Triggering Darwin with GCC toolchain" compiler_stage1+=" sys-apps/darwin-miscutils" local ccvers="$(unset CHOST; /usr/bin/gcc --version 2>/dev/null)" + local isgcc= case "${ccvers}" in *"(GCC) 4.2.1 "*) linker="=sys-devel/binutils-apple-3.2.6" + isgcc=true ;; *"(GCC) 4.0.1 "*) linker="=sys-devel/binutils-apple-3.2.6" @@ -200,6 +202,7 @@ configure_toolchain() { compiler_stage1+=" sys-devel/gcc-apple =sys-devel/binutils-apple-3.2.6" + isgcc=true ;; *"Apple clang version "*|*"Apple LLVM version "*) # recent binutils-apple are hard to build (C++11 @@ -214,9 +217,15 @@ configure_toolchain() { return 1 ;; esac - # current compiler (gcc-11 requires C++11, which is - # available since 4.8, so need to bootstrap with <11) - compiler_stage1+="