Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk If the per-target LDSTATIC flag is set, don't inclu...



details:   https://anonhg.NetBSD.org/src/rev/4e9e9909ef61
branches:  trunk
changeset: 814701:4e9e9909ef61
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Apr 04 15:06:16 2016 +0000

description:
If the per-target LDSTATIC flag is set, don't include the PIE linker
flags as we currently don't support static PIE.

diffstat:

 share/mk/bsd.prog.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 966c4fd99b53 -r 4e9e9909ef61 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Mon Apr 04 13:45:40 2016 +0000
+++ b/share/mk/bsd.prog.mk      Mon Apr 04 15:06:16 2016 +0000
@@ -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 @@
 .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}



Home | Main Index | Thread Index | Old Index