Module Name: src
Committed By: joerg
Date: Wed Jan 15 13:59:38 UTC 2014
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
-Wl,-pie and -r don't agree with each other, so filter the former out.
To generate a diff of this commit:
cvs rdiff -u -r1.286 -r1.287 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.286 src/share/mk/bsd.prog.mk:1.287
--- src/share/mk/bsd.prog.mk:1.286 Mon Nov 11 10:24:53 2013
+++ src/share/mk/bsd.prog.mk Wed Jan 15 13:59:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.286 2013/11/11 10:24:53 joerg Exp $
+# $NetBSD: bsd.prog.mk,v 1.287 2014/01/15 13:59:38 joerg Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -535,7 +535,7 @@ ${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${
${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}
${_MKTARGET_LINK}
- ${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
+ ${CC} ${LDFLAGS:N-Wl,-pie} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
.if defined(_PROGDEBUG.${_P})
${_PROGDEBUG.${_P}}: ${_P}
