diff options
| author | joerg <joerg@pkgsrc.org> | 2008-01-12 14:40:21 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-01-12 14:40:21 +0000 |
| commit | f30bc9ac38887fee4f8fe908469981e69c3316d3 (patch) | |
| tree | 38b2b87e6f1d832db5b02738941d7129c61c8cd9 /mk | |
| parent | ac5eb17c0fb1515cc3a9e71ebea514670cc6eb75 (diff) | |
| download | pkgsrc-f30bc9ac38887fee4f8fe908469981e69c3316d3.tar.gz | |
If LOWER_ARCH is x86_64 on Linux, force it for MACHINE_ARCH as well.
On a Core 2 Xeon, it breaks a lot of things otherwise as it ends up as
something like "Intel(R) Core(R)".
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index ffdce034438..c9eb0eee5a4 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.274 2008/01/04 01:46:24 rillig Exp $ +# $NetBSD: bsd.prefs.mk,v 1.275 2008/01/12 14:40:21 joerg Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -187,6 +187,9 @@ MACHINE_ARCH:= ${MACHINE_ARCH:C/ppc/powerpc/} . if !defined(LOWER_ARCH) LOWER_ARCH!= ${UNAME} -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/' . endif # !defined(LOWER_ARCH) +. if ${LOWER_ARCH} == "x86_64" +MACHINE_ARCH= x86_64 +. endif . if ${MACHINE_ARCH} == "unknown" || ${MACHINE_ARCH} == "" MACHINE_ARCH= ${LOWER_ARCH} MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q} |