diff options
| author | tron <tron@pkgsrc.org> | 2009-09-21 15:28:03 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2009-09-21 15:28:03 +0000 |
| commit | 850c257200925f31b37d174c6eb3ed3761729c0e (patch) | |
| tree | 7ebe532a538efd5db142d3681b38f8a7df7d3941 | |
| parent | 3199c9719383eb8b4f46e39b6ef38e20f81b0c4b (diff) | |
| download | pkgsrc-850c257200925f31b37d174c6eb3ed3761729c0e.tar.gz | |
Revert last change. It doesn't work properly because the "ABI" setting
is not defined that early as we have included neither "bsd.own.mk"
nor "mk.conf" yet.
We unfortunately cannot make these adjustments later because "bsd.own.mk"
and "mk.conf" would be processed with an incorrect value for
"MACHINE_ARCH".
| -rw-r--r-- | mk/bsd.prefs.mk | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 1ce9d23b475..73ebc9f4979 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.296 2009/09/21 10:56:08 tron Exp $ +# $NetBSD: bsd.prefs.mk,v 1.297 2009/09/21 15:28:03 tron Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -123,25 +123,7 @@ LOWER_OPSYS?= bsdi .elif ${OPSYS} == "Darwin" LOWER_OPSYS?= darwin -.if empty(OS_VERSION:M[1-9].*.*) -# Determine the ABI under Mac OS X Snow Leopard and adjust -# the machine archicture accordingly. -. if !defined(ABI) -_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 -. endif -.if ${ABI} == "32" -LOWER_ARCH= i386 -.else -LOWER_ARCH= x86_64 -.endif -.else LOWER_ARCH!= ${UNAME} -p -.endif MACHINE_ARCH= ${LOWER_ARCH} MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q} LOWER_OPSYS_VERSUFFIX= ${LOWER_OS_VERSION:C/([0-9]*).*/\1/} |