summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2024-07-25 13:16:04 +0200
committerFabian Groffen <grobian@gentoo.org>2024-07-25 13:16:04 +0200
commita39343a48782999fcf03a80cc7c7a90609faaa17 (patch)
tree5f6a1d9b3386639bf5a48354f2b96fc2e3fe7b72
parentscripts/bootstrap-prefix: disable USE=pie for Solaris bootstrap (diff)
downloadprefix-a39343a48782999fcf03a80cc7c7a90609faaa17.tar.gz
prefix-a39343a48782999fcf03a80cc7c7a90609faaa17.tar.bz2
prefix-a39343a48782999fcf03a80cc7c7a90609faaa17.zip
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@gentoo.org>
-rwxr-xr-xscripts/bootstrap-prefix.sh8
1 files changed, 7 insertions, 1 deletions
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|')"
;;