From 2389f54d75dab39a49fe530736081b0cf2b54972 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 2 Mar 2024 13:56:59 +0100
Subject: [PATCH] scripts/auto-bootstraps: deprecate x86-darwin9, fix CHOST
 reporting

Signed-off-by: Fabian Groffen <grobian@gentoo.org>
---
 scripts/auto-bootstraps/analyse_result.py | 1 +
 scripts/auto-bootstraps/dobootstrap       | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index 094462a1dc..5314d66593 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -10,6 +10,7 @@
 resultsdir='./results'
 
 deprecated_archs = (
+        'i386-apple-darwin9',
         'x86_64-pc-cygwin',
         'i386-pc-solaris2.11',
         'sparc-sun-solaris2.10',
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 45b37c5211..14cc137a0d 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -146,7 +146,8 @@ do_prepare() {
 		echo $((endtime - starttime)) > elapsedtime
 
 		# get identification of host that includes Linux distro, RAP, ...
-		chost=$(${BASH} ./bootstrap-prefix.sh chost.identify x)
+		chost=$(env CHOST=${chost} \
+			${BASH} ./bootstrap-prefix.sh chost.identify x)
 
 		rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/
 		rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/${chost}/