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 72DBE1382C5 for ; Fri, 18 Dec 2020 08:18:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0978E0956; Fri, 18 Dec 2020 08:18:05 +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 9569BE0956 for ; Fri, 18 Dec 2020 08:18:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 8B6E7341000 for ; Fri, 18 Dec 2020 08:18:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BE7E57 for ; Fri, 18 Dec 2020 08:18:03 +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: <1608279263.8a3521c24f0ea7fa6558c127dc65af6fb34da867.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: 8a3521c24f0ea7fa6558c127dc65af6fb34da867 X-VCS-Branch: master Date: Fri, 18 Dec 2020 08:18:03 +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: f031bd05-8072-4b4f-989f-1832e955b507 X-Archives-Hash: 668921fbb488a45849513aef6d377e62 commit: 8a3521c24f0ea7fa6558c127dc65af6fb34da867 Author: Fabian Groffen gentoo org> AuthorDate: Fri Dec 18 08:14:23 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Dec 18 08:14:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8a3521c2 scripts/bootstrap-prefix: fix SDKPATH logic, add comments Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 01e40e9bda..c085472a23 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -520,7 +520,7 @@ bootstrap_setup() { # managed using an eselect module in the future rm -f "${ROOT}"/MacOSX.sdk local SDKPATH=$(xcrun --show-sdk-path --sdk macosx) - if [[ -e ${SDKPATH} ]] ; then + if [[ ! -e ${SDKPATH} ]] ; then SDKPATH=$(xcodebuild -showsdks | sort -nr \ | grep -o "macosx.*" | head -n1) SDKPATH=$(xcode-select -print-path)/SDKs/MacOSX${SDKPATH#macosx}.sdk @@ -3058,6 +3058,9 @@ if [[ -z ${CHOST} ]]; then # Lion and up are 64-bits default (and 64-bits CPUs) CHOST="x86_64-apple-darwin$rev" elif [[ ${rev} -ge 20 ]] ; then + # uname -p returns arm, -m returns arm64 on this + # release while on Darwin 9 -m returns something + # like "PowerPC Machine", hence the distinction CHOST="`uname -m`-apple-darwin$rev" else CHOST="`uname -p`-apple-darwin$rev"