diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2013-03-10 08:50:43 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2013-03-10 08:50:43 +0000 |
| commit | d2440e6b97c3e339ce0b3b2c3bb67927edbb5593 (patch) | |
| tree | 5845aa9cd04b7173751664b8a728d058dc6e2c1e /share/mk/bsd.own.mk | |
| parent | 98a271535e6d3271dc0526469542d53a8ffe3d4d (diff) | |
Allow the PIE/NOPIE variables in bsd.own.mk to be overriden. Force proper
values in Makefile.cross to make sure binutils are built with the proper
PIE_DEFAULT value for the target.
ok millert@ deraadt@
Diffstat (limited to 'share/mk/bsd.own.mk')
| -rw-r--r-- | share/mk/bsd.own.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 3e04fe9a769..09eab95b187 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.own.mk,v 1.136 2013/02/10 20:27:18 miod Exp $ +# $OpenBSD: bsd.own.mk,v 1.137 2013/03/10 08:50:42 miod Exp $ # $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $ # Host-specific overrides @@ -53,12 +53,12 @@ BINUTILS_VERSION=binutils .endif .if !empty(PIE_ARCH:M${_arch}) -NOPIE_FLAGS=-fno-pie -NOPIE_LDFLAGS=-nopie -PIE_DEFAULT=${DEFAULT_PIE_DEF} +NOPIE_FLAGS?=-fno-pie +NOPIE_LDFLAGS?=-nopie +PIE_DEFAULT?=${DEFAULT_PIE_DEF} .else -NOPIE_FLAGS= -PIE_DEFAULT= +NOPIE_FLAGS?= +PIE_DEFAULT?= .endif .endfor |