summaryrefslogtreecommitdiff
path: root/bootstrap/bootstrap
diff options
context:
space:
mode:
authorsevan <sevan>2015-11-07 14:05:20 +0000
committersevan <sevan>2015-11-07 14:05:20 +0000
commitf936cd90d5a96be43b0a15facf593329b5219933 (patch)
tree155baa2cecc5d50896dc054aa4d56df558e1eb2f /bootstrap/bootstrap
parent36dd4eb62647173e51d16af8f8215ee596997343 (diff)
downloadpkgsrc-f936cd90d5a96be43b0a15facf593329b5219933.tar.gz
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@
Diffstat (limited to 'bootstrap/bootstrap')
-rwxr-xr-xbootstrap/bootstrap8
1 files changed, 6 insertions, 2 deletions
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