summaryrefslogtreecommitdiff
path: root/Makefile.cross
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2014-05-09 20:14:19 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2014-05-09 20:14:19 +0000
commit5aedb7610a58488398a891c28887703eda7c3293 (patch)
treea87edd41d8cd3cb87ee0547a676e6b12fc47fec1 /Makefile.cross
parent7699954e2c9dcc5827f97d694bbfb89b924fc102 (diff)
Make sure to override PIE_DEFAULT when building a cross-gcc4
Diffstat (limited to 'Makefile.cross')
-rw-r--r--Makefile.cross8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.cross b/Makefile.cross
index 7945ffe8afa..f4749f9bca7 100644
--- a/Makefile.cross
+++ b/Makefile.cross
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.70 2014/04/23 18:24:23 ajacoutot Exp $
+# $OpenBSD: Makefile.cross,v 1.71 2014/05/09 20:14:18 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
@@ -252,19 +252,23 @@ ${CROSSGCC}: ${CROSSBINUTILS}
ln -sf ${TARGET_CANON}-cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/cpp
.else
(cd ${.CURDIR}/gnu/usr.bin/cc; \
+ PIE_DEFAULT=${PIE_DEFAULT} \
MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
CROSSDIR=${CROSSDIR} \
MACHINE=${TARGET} \
PATH=${CROSSPATH} ${MAKE} depend )
(cd ${.CURDIR}/gnu/usr.bin/cc; \
+ PIE_DEFAULT=${PIE_DEFAULT} \
MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
CROSSDIR=${CROSSDIR} \
MACHINE=${TARGET} \
${MAKE} all )
(cd ${.CURDIR}/gnu/usr.bin/cc; \
- env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+ env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} \
+ PIE_DEFAULT=${PIE_DEFAULT} \
+ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
MACHINE=${TARGET} \
PATH=${CROSSPATH} ${MAKE} install)