From 7ad83e97cc072ff70e7bc206811c58a348d18c13 Mon Sep 17 00:00:00 2001
From: sevan <sevan@pkgsrc.org>
Date: Sat, 7 Nov 2015 14:05:20 +0000
Subject: Use arch(1) to detect the architecture of host Switch $machine_arch
 to x86_64 if on OpenBSD/amd64 Pass $machine_arch to the devel/bmake build
 process

Reviewed by wiz@
---
 bootstrap/bootstrap | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'bootstrap')

diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 2eec7405714..62a6e10732a 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.218 2015/06/13 13:15:39 tron Exp $
+# $NetBSD: bootstrap,v 1.219 2015/11/07 14:05:20 sevan Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
 # All rights reserved.
@@ -759,7 +759,11 @@ OpenBSD)
 	need_awk=no
 	need_sed=no
 	set_opsys=no
-	machine_arch=`uname -m`
+	machine_arch=`arch -s`
+	if [ "$machine_arch" = "amd64" ]; then
+		machine_arch=x86_64
+		bmakexargs="MACHINE_ARCH=$machine_arch"
+	fi
 	;;
 OSF1)
 	root_group=system
-- 
cgit v1.2.3