summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2010-09-24 14:04:06 +0000
committermiod <miod@openbsd.org>2010-09-24 14:04:06 +0000
commit529d6bc564100e5623c7ae3aa723a112f5034974 (patch)
tree9ddb85688868f85a0e39974ce17371063f78f0b3
parentBump libc major for ABI changes. (diff)
downloadwireguard-openbsd-529d6bc564100e5623c7ae3aa723a112f5034974.tar.xz
wireguard-openbsd-529d6bc564100e5623c7ae3aa723a112f5034974.zip
Switch mips-based ports to gcc4. Most of the work has been done by kettenis@.
-rw-r--r--Makefile.cross6
-rw-r--r--share/mk/bsd.own.mk6
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.cross b/Makefile.cross
index a0e91c08129..27e68f9157e 100644
--- a/Makefile.cross
+++ b/Makefile.cross
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.38 2010/09/23 19:00:48 pirofti Exp $
+# $OpenBSD: Makefile.cross,v 1.39 2010/09/24 14:04:06 miod 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
@@ -79,8 +79,8 @@ CROSSGCC= ${CROSSDIR}/.gcc_done
TARGET_USE_GCC3=No
COMPILER_VERSION=gcc2
.elif ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "hppa" || \
- ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "powerpc" || \
- ${TARGET_ARCH} == "sparc64"
+ ${TARGET_ARCH} == "i386" || ${TARGET_ARCH:Mmips64*} || \
+ ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64"
TARGET_USE_GCC4=Yes
COMPILER_VERSION=gcc4
.else
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index c624451c98a..2e024803006 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.own.mk,v 1.103 2010/07/08 20:25:40 kettenis Exp $
+# $OpenBSD: bsd.own.mk,v 1.104 2010/09/24 14:04:06 miod Exp $
# $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
# Host-specific overrides
@@ -37,8 +37,8 @@ ELF_TOOLCHAIN?= yes
USE_GCC3?=no
COMPILER_VERSION?=gcc2
.elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "hppa" || \
- ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
- ${MACHINE_ARCH} == "sparc64"
+ ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH:Mmips64*} || \
+ ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
COMPILER_VERSION?=gcc4
.else
USE_GCC3?=yes