commit: 9f3aa797227a200600d22333ed4042e0b7c9024f
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 29 18:52:05 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 29 18:52:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9f3aa797
scripts/bootstrap-prefix: drop Darwin 9 to 32-bits only
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 3 ++-
scripts/bootstrap-prefix.sh | 8 +++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/scripts/auto-bootstraps/dobootstrap
b/scripts/auto-bootstraps/dobootstrap
index c237433034..60ed9b69ea 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -39,8 +39,9 @@ do_prepare() {
local chost=$(${BASH} ${bootstrap} chost.guess x)
case ${chost} in
- powerpc*-*darwin*)
+ powerpc*-*darwin[89])
# ppc64-darwin never really worked for unknown reasons
+ # darwin9 (Leopard) doesn't work on Intel either
bitw=32
;;
*-solaris*|*-darwin*)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e743594647..9e2c9ca8ce 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2501,7 +2501,7 @@ EOF
if type -P xcode-select > /dev/null ; then
if [[ -d /usr/include ]] ; then
# if we have /usr/include we're on an older system
- if [[ ${CHOST} == powerpc* ]]; then
+ if [[ ${CHOST} == *-darwin[89] ]]; then
# ancient Xcode (3.0/3.1)
cat << EOF
@@ -2603,9 +2603,11 @@ EOF
local candomultilib=no
local t64 t32
case "${CHOST}" in
- *86*-darwin9|*86*-darwin1[012345])
+ *86*-darwin1[012345])
# PPC/Darwin only works in 32-bits mode, so this is
Intel
- # only, and only starting from Leopard (10.5, darwin9)
+ # only, and officially starting from Leopard (10.5,
darwin9)
+ # but this is broken, so stick to 32-bits there, and
use it
+ # from Snow Lepard (10.6).
# with Big Sur (11.0, darwin20) we have x64 or arm64
only
candomultilib=yes
t64=x86_64-${CHOST#*-}
