summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2015-11-09 10:54:44 +0000
committerjperkin <jperkin@pkgsrc.org>2015-11-09 10:54:44 +0000
commit02739afb8b441b03e5f02f046244c5b2ecc38572 (patch)
treeb74685909e8c2c0abf03e42283ff0bb0508a507b
parentc4a7cf44a28a86f0ef4ed152280cda4272c1fa95 (diff)
downloadpkgsrc-02739afb8b441b03e5f02f046244c5b2ecc38572.tar.gz
Default to ABI=64 on Darwin hosts which report as x86_64.
-rwxr-xr-xbootstrap/bootstrap18
1 files changed, 16 insertions, 2 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index fe7eea119a8..fe808bfbd46 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: bootstrap,v 1.220 2015/11/07 19:55:46 sevan Exp $
+# $NetBSD: bootstrap,v 1.221 2015/11/09 10:54:44 jperkin Exp $
#
# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
# All rights reserved.
@@ -175,10 +175,23 @@ get_abi()
abi_opsys=$@
if [ -n "$abi" ]; then
- die "ERROR: $abi_opsys has special ABI handling, --abi not supported (yet)."
+ case "$abi_opsys" in
+ IRIX)
+ die "ERROR: $abi_opsys has special ABI handling, --abi not supported (yet)."
+ ;;
+ esac
fi
case "$abi_opsys" in
+ Darwin)
+ if [ -z "$abi" ]; then
+ case `uname -m` in
+ x86_64)
+ abi="64"
+ ;;
+ esac
+ fi
+ ;;
IRIX)
if [ `uname -r` -ge 6 ]; then
abi=`sed -e 's/.*\(abi=\)\([on]*[36][24]\).*/\2/' /etc/compiler.defaults`
@@ -541,6 +554,7 @@ Darwin)
need_awk=no
need_sed=no
set_opsys=no
+ get_abi "Darwin"
machine_arch=`uname -p`
CC=${CC:-"cc -isystem /usr/include"}; export CC
check_compiler=yes