Module Name: src
Committed By: joerg
Date: Mon Apr 4 15:06:17 UTC 2016
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
If the per-target LDSTATIC flag is set, don't include the PIE linker
flags as we currently don't support static PIE.
To generate a diff of this commit:
cvs rdiff -u -r1.298 -r1.299 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.298 src/share/mk/bsd.prog.mk:1.299
--- src/share/mk/bsd.prog.mk:1.298 Wed Mar 30 13:05:09 2016
+++ src/share/mk/bsd.prog.mk Mon Apr 4 15:06:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.298 2016/03/30 13:05:09 martin Exp $
+# $NetBSD: bsd.prog.mk,v 1.299 2016/04/04 15:06:16 joerg Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -51,7 +51,7 @@ CLEANFILES+=strings
.if defined(MKPIE) && (${MKPIE} != "no") && !defined(NOPIE)
CFLAGS+= ${PIE_CFLAGS}
AFLAGS+= ${PIE_AFLAGS}
-LDFLAGS+= ${PIE_LDFLAGS}
+LDFLAGS+= ${"${LDSTATIC.${.TARGET}}" == "-static" :? : ${PIE_LDFLAGS}}
.endif
CFLAGS+= ${COPTS}
