commit: 8a3521c24f0ea7fa6558c127dc65af6fb34da867
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 08:14:23 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> 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 <grobian <AT> 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"
