diff options
| -rw-r--r-- | Makefile.cross | 17 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 12 |
2 files changed, 19 insertions, 10 deletions
diff --git a/Makefile.cross b/Makefile.cross index 31ffcf92ef3..7528614cade 100644 --- a/Makefile.cross +++ b/Makefile.cross @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.cross,v 1.60 2013/02/02 13:38:41 miod Exp $ +# $OpenBSD: Makefile.cross,v 1.61 2013/03/10 08:50:42 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 @@ -105,6 +105,15 @@ BINUTILS_VERSION=binutils-2.17 BINUTILS_VERSION=binutils .endif +.if !empty(PIE_ARCH:M${_arch}) +NOPIE_FLAGS=-fno-pie +NOPIE_LDFLAGS=-nopie +PIE_DEFAULT=${DEFAULT_PIE_DEF} +.else +NOPIE_FLAGS= +PIE_DEFAULT= +.endif + .if !empty(OLD_BINUTILS_ARCH:M${_arch}) NEW_BINUTILS?= No BINUTILS= ar as ld nm ranlib objcopy objdump strings strip @@ -198,17 +207,17 @@ ${CROSSINCLUDES}: ${CROSSOBJ} ${CROSSBINUTILS}: ${CROSSINCLUDES} (cd ${.CURDIR}/${BINUTILS_DIR}; \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ - USING_NEW_BINUTILS=${NEW_BINUTILS} \ + USING_NEW_BINUTILS=${NEW_BINUTILS} PIE_DEFAULT=${PIE_DEFAULT} \ TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ PATH=${CROSSPATH} \ ${MAKE} -f Makefile.bsd-wrapper depend && \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ - USING_NEW_BINUTILS=${NEW_BINUTILS} \ + USING_NEW_BINUTILS=${NEW_BINUTILS} PIE_DEFAULT=${PIE_DEFAULT} \ TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ ${MAKE} -f Makefile.bsd-wrapper all && \ DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ COMPILER_VERSION=${COMPILER_VERSION} \ - USING_NEW_BINUTILS=${NEW_BINUTILS} \ + USING_NEW_BINUTILS=${NEW_BINUTILS} PIE_DEFAULT=${PIE_DEFAULT} \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ USING_NEW_BINUTILS=${NEW_BINUTILS} \ TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ 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 |