From 943256d309c62d996ad9f99cfb1a18adb2c88215 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin>
Date: Wed, 6 Jan 2016 17:59:58 +0000
Subject: Ensure we set MACHINE_ARCH correctly for Darwin x86_64.  Fixes recent
 bootstrap issues.

---
 bootstrap/bootstrap | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 48f1abd362f..2a56f19f233 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.225 2015/12/29 21:13:57 joerg Exp $
+# $NetBSD: bootstrap,v 1.226 2016/01/06 17:59:58 jperkin Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
 # All rights reserved.
@@ -556,6 +556,9 @@ Darwin)
 	set_opsys=no
 	get_abi "Darwin"
 	machine_arch=`uname -p`
+	if [ "$machine_arch" = "i386" -a "$abi" = "64" ]; then
+		machine_arch=x86_64
+	fi
 	CC=${CC:-"cc -isystem /usr/include"}; export CC
 	check_compiler=yes
 	osrev=`uname -r`
-- 
cgit v1.2.3