summaryrefslogtreecommitdiff
path: root/bootstrap/bootstrap
diff options
context:
space:
mode:
authorsevan <sevan>2015-11-07 19:55:46 +0000
committersevan <sevan>2015-11-07 19:55:46 +0000
commit9ac30eafe1c61e3409e3fd0589d5461d2de7ec2e (patch)
tree6fde09c3ff4652e1620e6e6fdcaf2f4669a96db4 /bootstrap/bootstrap
parentdf138da6dcf02677ac9c6c6b486a7b25922f9b71 (diff)
downloadpkgsrc-9ac30eafe1c61e3409e3fd0589d5461d2de7ec2e.tar.gz
For Bitrig
Switch to using arch(1) to detect the architecture of host Set $machine_arch to x86_64 if on 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 62a6e10732a..fe7eea119a8 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: bootstrap,v 1.219 2015/11/07 14:05:20 sevan Exp $
+# $NetBSD: bootstrap,v 1.220 2015/11/07 19:55:46 sevan Exp $
#
# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
# All rights reserved.
@@ -509,7 +509,11 @@ Bitrig)
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
check_compiler=yes
;;
CYGWIN_*)