summaryrefslogtreecommitdiff
path: root/share/mk
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2013-08-06 19:05:58 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2013-08-06 19:05:58 +0000
commit4deeb07029db0412704e811b0e924993fe415641 (patch)
treea21f72f9344132c2b2b9d8e2e47e4d6deaa4e750 /share/mk
parent35bb09cb161c4a0e95ff0c4183433ffea20308f7 (diff)
Switch vax to gcc 3.3.6.
Diffstat (limited to 'share/mk')
-rw-r--r--share/mk/bsd.own.mk13
1 files changed, 5 insertions, 8 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 6763f6a0e67..994314b033a 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.own.mk,v 1.140 2013/07/05 21:13:35 miod Exp $
+# $OpenBSD: bsd.own.mk,v 1.141 2013/08/06 19:05:57 miod Exp $
# $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
# Host-specific overrides
@@ -24,8 +24,7 @@ DEBUGLIBS?= no
# Set toolchain to be able to know differences.
ELF_TOOLCHAIN?= yes
-GCC2_ARCH=vax
-GCC4_ARCH=alpha amd64 arm hppa hppa64 i386 ia64 mips64 mips64el powerpc sh sparc sparc64
+GCC3_ARCH=m68k m88k vax
BINUTILS217_ARCH=hppa64 ia64
# i386 PIE works; but there are RAMDISK fitting problems.
@@ -34,12 +33,10 @@ BINUTILS217_ARCH=hppa64 ia64
PIE_ARCH=alpha amd64 hppa mips64 mips64el sh sparc64
.for _arch in ${MACHINE_ARCH}
-.if !empty(GCC2_ARCH:M${_arch})
-COMPILER_VERSION?=gcc2
-.elif !empty(GCC4_ARCH:M${_arch})
-COMPILER_VERSION?=gcc4
-.else
+.if !empty(GCC3_ARCH:M${_arch})
COMPILER_VERSION?=gcc3
+.else
+COMPILER_VERSION?=gcc4
.endif
.if !empty(BINUTILS217_ARCH:M${_arch})