[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a39343a48782999fcf03a80cc7c7a90609faaa17
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 11:16:04 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 11:16:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a39343a4

scripts/bootstrap-prefix: use isainfo to pick up current arch

uname -p on Solaris will return historical values, so use isainfo to get
the currently targetted architecture

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index eb89fa4847..e434b1c61d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -3409,10 +3409,16 @@ if [[ -z ${CHOST} ]]; then
                                fi
                                ;;
                        SunOS)
-                               case $(uname -p) in
+                               case $(isainfo -n) in
+                                       amd64)
+                                               CHOST="x86_64-pc-solaris$(uname 
-r | sed 's|5|2|')"
+                                       ;;
                                        i386)
                                                CHOST="i386-pc-solaris$(uname 
-r | sed 's|5|2|')"
                                        ;;
+                                       sparcv9)
+                                               
CHOST="sparcv9-sun-solaris$(uname -r | sed 's|5|2|')"
+                                       ;;
                                        sparc)
                                                CHOST="sparc-sun-solaris$(uname 
-r | sed 's|5|2|')"
                                        ;;