diff options
| author | jperkin <jperkin@pkgsrc.org> | 2020-05-30 21:36:15 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2020-05-30 21:36:15 +0000 |
| commit | 159342e3c19973cb7e16fc6df949473923045287 (patch) | |
| tree | 55d346bbc06034480946aa53c058bb6ebb2e15e8 /bootstrap/bootstrap | |
| parent | 950e36fca6bbe1bbf1a4affe44a3f2c416453962 (diff) | |
| download | pkgsrc-159342e3c19973cb7e16fc6df949473923045287.tar.gz | |
bootstrap: Fix default target arch on SunOS.
Use the kernel architecture via isainfo -k to base our default on, as uname
will always return the same result regardless. Ensures we default to 64-bit
pkgsrc on amd64, as well as adding support for sparcv9.
Diffstat (limited to 'bootstrap/bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 8061841353d..1e2f12e60c4 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.280 2020/05/25 07:32:59 jperkin Exp $ +# $NetBSD: bootstrap,v 1.281 2020/05/30 21:36:15 jperkin Exp $ # # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> # All rights reserved. @@ -869,7 +869,7 @@ SunOS) idprog="/usr/xpg4/bin/id" groupsprog="${idprog} -gn" whoamiprog="${idprog} -un" - machine_arch=`uname -p | sed -e 's/i86pc/i386/'` + machine_arch=`isainfo -k` check_compiler=yes check_ssp=yes ;; @@ -915,7 +915,9 @@ powerpc/*) abi=32 machine_arch=powerpc ;; powerpc64/32) abi=32 machine_arch=powerpc ;; powerpc64/*) abi=64 machine_arch=powerpc64 ;; powerpc64le/*) abi=64 machine_arch=powerpc64le;; -# "sparc" can support 64-bit, e.g. SunOS, defaults to 32-bit. +# sparc/sparcv9 support 32-bit/64-bit, default to native. +sparcv9/32) abi=32 machine_arch=sparc ;; +sparcv9/*) abi=64 machine_arch=sparc64 ;; sparc/64) abi=64 machine_arch=sparc64 ;; sparc/*) abi=32 machine_arch=sparc ;; # x86_64 supports 32-bit/64-bit, defaults to 64-bit. |