diff options
| author | jperkin <jperkin@pkgsrc.org> | 2012-06-11 09:36:02 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2012-06-11 09:36:02 +0000 |
| commit | 636db6a592ab4505a315b742115378ff76073e44 (patch) | |
| tree | 2ef70c392b82203ff708af9eebea42ee8383412f /mk/bsd.prefs.mk | |
| parent | 6eb5df1d3acec04fbdf5151d84a096beec20d3ee (diff) | |
| download | pkgsrc-636db6a592ab4505a315b742115378ff76073e44.tar.gz | |
Set MACHINE_ARCH=x86_64 when ABI=64 on Solaris/x86, required for packages
such as devel/gmp which do their own ABI determination.
Full clean bulk build with this change:
http://mail-index.netbsd.org/pkgsrc-bulk/2012/06/11/msg008920.html
looks good.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 252238779dd..60587a27aa8 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.321 2012/03/19 12:34:15 joerg Exp $ +# $NetBSD: bsd.prefs.mk,v 1.322 2012/06/11 09:36:02 jperkin Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -260,8 +260,11 @@ SPARC_TARGET_ARCH?= sparcv7 . elif ${MACHINE_ARCH} == "sun4" MACHINE_ARCH= sparc SPARC_TARGET_ARCH?= sparcv7 -. elif ${MACHINE_ARCH} == "i86pc" || ${MACHINE_ARCH} == "i86xpv" -MACHINE_ARCH= i386 +. elif ${MACHINE_ARCH} == "i86pc" || ${MACHINE_ARCH} == "i86xpv" || ${MACHINE_ARCH} == "i386" +LOWER_ARCH.32= i386 +LOWER_ARCH.64= x86_64 +LOWER_ARCH= ${LOWER_ARCH.${ABI}} +MACHINE_ARCH= ${LOWER_ARCH} . elif ${MACHINE_ARCH} == "unknown" . if !defined(LOWER_ARCH) LOWER_ARCH!= ${UNAME} -p |