diff options
| author | tron <tron@pkgsrc.org> | 2009-09-24 17:24:13 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2009-09-24 17:24:13 +0000 |
| commit | 3df9e23baa87d4f81ff2c79116490868efa5ef6b (patch) | |
| tree | 63c3b057bc32dfbbbdc23ba2b4705c16f853daab /mk/bsd.prefs.mk | |
| parent | 2c62d46403d7b1b7c7a35be4065d5bf3f18cf138 (diff) | |
| download | pkgsrc-3df9e23baa87d4f81ff2c79116490868efa5ef6b.tar.gz | |
Unconditionally set the default ABI to 32-Bit for Mac OS X Snow Leopard.
There are too many third party applications which don't build using
the 64-Bit ABI at the moment.
Approved by Alistair Crooks.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 67039f46261..34d2ca3aed2 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.299 2009/09/22 19:19:29 hasso Exp $ +# $NetBSD: bsd.prefs.mk,v 1.300 2009/09/24 17:24:13 tron Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -124,12 +124,17 @@ LOWER_OPSYS?= bsdi .elif ${OPSYS} == "Darwin" LOWER_OPSYS?= darwin .if empty(OS_VERSION:M[1-9].*.*) -_SYSCTL_HW_OPTIONAL_X86_64!= /usr/sbin/sysctl -n hw.optional.x86_64 -. if ${_SYSCTL_HW_OPTIONAL_X86_64} == "1" -ABI= 64 -.else +# Automatically select the ABI under Mac OS X Snow Leopard. We don't +# use this at the moment because too many third party programs don't +# work with it. +# +# _SYSCTL_HW_OPTIONAL_X86_64!= /usr/sbin/sysctl -n hw.optional.x86_64 +# . if ${_SYSCTL_HW_OPTIONAL_X86_64} == "1" +# ABI= 64 +# .else +# ABI= 32 +#. endif ABI= 32 -. endif LOWER_ARCH.32= i386 LOWER_ARCH.64= x86_64 LOWER_ARCH= ${LOWER_ARCH.${ABI}} |