diff options
| author | jperkin <jperkin> | 2016-01-06 17:59:58 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2016-01-06 17:59:58 +0000 |
| commit | 943256d309c62d996ad9f99cfb1a18adb2c88215 (patch) | |
| tree | 25e56efde3aeca1f90c8ef5dce03ccceb13a5d86 /bootstrap | |
| parent | 299c0a8cb4c4058e2d8a612563c6026eba9f2917 (diff) | |
| download | pkgsrc-943256d309c62d996ad9f99cfb1a18adb2c88215.tar.gz | |
Ensure we set MACHINE_ARCH correctly for Darwin x86_64. Fixes recent
bootstrap issues.
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 5 |
1 files changed, 4 insertions, 1 deletions
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` |