diff options
| -rw-r--r-- | Makefile.cross | 6 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/Makefile.cross b/Makefile.cross index 6ee5a85977c..dfc03eed41a 100644 --- a/Makefile.cross +++ b/Makefile.cross @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.cross,v 1.54 2012/08/02 13:38:38 okan Exp $ +# $OpenBSD: Makefile.cross,v 1.55 2012/08/14 20:14:35 matthew Exp $ cross-tools: cross-includes cross-binutils cross-gcc cross-lib cross-distrib: cross-tools cross-bin cross-share cross-sys cross-etc-root-var @@ -92,14 +92,10 @@ OLD_BINUTILS_ARCH=m68k m88k vax .for _arch in ${TARGET_ARCH} .if !empty(GCC2_ARCH:M${_arch}) -USE_GCC3?=no -TARGET_USE_GCC3=No COMPILER_VERSION?=gcc2 .elif !empty(GCC4_ARCH:M${_arch}) -TARGET_USE_GCC4=Yes COMPILER_VERSION?=gcc4 .else -TARGET_USE_GCC3=Yes COMPILER_VERSION?=gcc3 .endif diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index f08260682eb..d2a76d29eb0 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.own.mk,v 1.117 2012/08/14 20:11:37 matthew Exp $ +# $OpenBSD: bsd.own.mk,v 1.118 2012/08/14 20:14:35 matthew Exp $ # $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $ # Host-specific overrides @@ -37,12 +37,10 @@ BINUTILS217_ARCH=avr32 hppa64 ia64 .for _arch in ${MACHINE_ARCH} .if !empty(GCC2_ARCH:M${_arch}) -USE_GCC3?=no COMPILER_VERSION?=gcc2 .elif !empty(GCC4_ARCH:M${_arch}) COMPILER_VERSION?=gcc4 .else -USE_GCC3?=yes COMPILER_VERSION?=gcc3 .endif |