summaryrefslogtreecommitdiff
path: root/share/mk
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2015-06-01 17:36:20 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2015-06-01 17:36:20 +0000
commitb0c1b3da40f49f74272352a73b0d07b4f2586269 (patch)
treea0947dd4f978c5dce2c311d573eded6b76fec808 /share/mk
parentf2a0eaf5bc817de32cd0b3b971fdcb0bab9d37ce (diff)
Now that we do not need to build binutils 2.15 (except for gdb), simplify the
build logic.
Diffstat (limited to 'share/mk')
-rw-r--r--share/mk/bsd.own.mk9
1 files changed, 1 insertions, 8 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 04399ed446a..069357449d6 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.own.mk,v 1.167 2015/06/01 17:35:24 miod Exp $
+# $OpenBSD: bsd.own.mk,v 1.168 2015/06/01 17:36:19 miod Exp $
# $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
# Host-specific overrides
@@ -18,7 +18,6 @@ YP?= yes
DEBUGLIBS?= no
GCC3_ARCH=m88k vax
-BINUTILS215_ARCH=
# arm needs binutils-2.17, which still lacks W^X support
# sparc has not been tried
@@ -34,12 +33,6 @@ COMPILER_VERSION?=gcc3
COMPILER_VERSION?=gcc4
.endif
-.if !empty(BINUTILS215_ARCH:M${_arch})
-BINUTILS_VERSION=binutils
-.else
-BINUTILS_VERSION=binutils-2.17
-.endif
-
.if !empty(STATICPIE_ARCH:M${_arch})
STATICPIE?=-pie
.endif