Tue Jul 21 15:53:10 2020 UTC ()

bootstrap: Fix machine_arch detection on Apple Sillicon

machine_arch was empty on Apple Sillicon. We could also use `uname -m` but that
returns arm64 which is not accepted by mk/gnu-config/config.sub.


(sjmulder)

diff -r1.288 -r1.289 pkgsrc/bootstrap/bootstrap

--- pkgsrc/bootstrap/bootstrap 2020/07/15 10:32:12 1.288
+++ pkgsrc/bootstrap/bootstrap 2020/07/21 15:53:10 1.289

 @@ -1,16 +1,16 @@
 #! /bin/sh
-# $NetBSD: bootstrap,v 1.288 2020/07/15 10:32:12 jperkin Exp $
+# $NetBSD: bootstrap,v 1.289 2020/07/21 15:53:10 sjmulder Exp $
+#
 # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 @@ -209,26 +209,29 @@ get_abi()
 get_machine_arch_aix()
+{
 	_cpuid=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El $_cpuid | grep ' POWER' >/dev/null 2>&1; then
 		echo rs6000
 	else
 		echo powerpc
 	fi
+}
 get_machine_arch_darwin()
+{
 	case `uname -p` in
 	arm)
 		echo "aarch64"
 		;;
 	i386)
 		# Returns "i386" or "x86_64" depending on CPU
 		echo `uname -m`
 		;;
 	powerpc)
 		echo "powerpc"
 		;;
 	esac
+}
 check_prog()
+{
 	_var="$1"; _name="$2"