re: CVS commit: src/share/mk

[matthew green <mrg%eterna.com.au@localhost>]

"Christos Zoulas" writes:
> Module Name:	src
> Committed By:	christos
> Date:		Sun Aug 28 14:22:35 UTC 2016
> 
> Modified Files:
> 	src/share/mk: bsd.own.mk
> 
> Log Message:
> Turn on PIE for all arm and sh3

this breaks earmv4 builds.  the patch below "fixes" that for me.


.mrg.


Index: bsd.own.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.own.mk,v
retrieving revision 1.948
diff -p -u -r1.948 bsd.own.mk
--- bsd.own.mk	28 Aug 2016 14:22:35 -0000	1.948
+++ bsd.own.mk	30 Aug 2016 03:46:51 -0000
@@ -1075,7 +1075,7 @@ MKCTF?=		yes
 #
 .if ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "x86_64" || \
-    ${MACHINE_CPU} == "arm" || \
+    (${MACHINE_CPU} == "arm" && empty(MACHINE_ARCH:M*armv4*)) || \
     ${MACHINE_CPU} == "sh3" || \
     ${MACHINE} == "sparc64"
 MKPIE?=		yes