summaryrefslogtreecommitdiff
path: root/share/mk
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-02-27 17:36:19 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-02-27 17:36:19 +0000
commitbf0a65b8ba35f3b89700a10c7eb23f2c8dc212cb (patch)
treec14e90f29f6ed57b9358529c8ef66d4b69c29a0f /share/mk
parentcadcabe0265db6753eccec3bcc53bdc5b837cc3d (diff)
change amd64's MACHINE_ARCH from x86_64 to amd64. There are many many
reasons for this, quite a few of them technical, and not all of them in response to Intel's broken ia32e crud. The gcc toolchain stays at x86_64 for now.
Diffstat (limited to 'share/mk')
-rw-r--r--share/mk/bsd.own.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 42c404c4e2b..ba7430a00cd 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.own.mk,v 1.79 2004/02/21 03:04:18 deraadt Exp $
+# $OpenBSD: bsd.own.mk,v 1.80 2004/02/27 17:36:16 deraadt Exp $
# $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
# Host-specific overrides
@@ -31,7 +31,8 @@ DEBUGLIBS?= no
.if ( ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "arm" || \
${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc" || \
- ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "x86_64")
+ ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "x86_64") || \
+ ${MACHINE} == "amd64"
ELF_TOOLCHAIN?= yes
.else
ELF_TOOLCHAIN?= no
@@ -39,7 +40,8 @@ ELF_TOOLCHAIN?= no
# do the dew
.if (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "hppa64" || \
- ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64")
+ ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64") || \
+ ${MACHINE} == "amd64"
USE_GCC3?=yes
.else
USE_GCC3?=no