Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/share/mk Don't remap mkdep, otherwise we add dependencies fo...
details: https://anonhg.NetBSD.org/src/rev/3dc623afd1e7
branches: trunk
changeset: 819873:3dc623afd1e7
user: christos <christos%NetBSD.org@localhost>
date: Wed Dec 21 03:00:51 2016 +0000
description:
Don't remap mkdep, otherwise we add dependencies for /usr/include instead
of ${DESTDIR}/usr/include and things go south.
diffstat:
share/mk/bsd.dep.mk | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diffs (45 lines):
diff -r 3ad8f224e0a6 -r 3dc623afd1e7 share/mk/bsd.dep.mk
--- a/share/mk/bsd.dep.mk Wed Dec 21 02:46:08 2016 +0000
+++ b/share/mk/bsd.dep.mk Wed Dec 21 03:00:51 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.dep.mk,v 1.82 2014/12/01 01:34:30 erh Exp $
+# $NetBSD: bsd.dep.mk,v 1.83 2016/12/21 03:00:51 christos Exp $
##### Basic targets
realdepend: beforedepend .depend afterdepend
@@ -62,7 +62,7 @@
${_MKTARGET_CREATE}
${MKDEP} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
${CFLAGS:M-std=*} ${CFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
- ${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
+ ${CPPFLAGS:N-Wp,-iremap,*} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} && \
mv ${.TARGET}.tmp ${.TARGET}
@@ -70,7 +70,7 @@
${_MKTARGET_CREATE}
${MKDEP} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
${OBJCFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
- ${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
+ ${CPPFLAGS:N-Wp,-iremap,*} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} && \
mv ${.TARGET}.tmp ${.TARGET}
@@ -78,7 +78,7 @@
${_MKTARGET_CREATE}
${MKDEP} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
${AFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
- ${CPPFLAGS} ${AFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} \
+ ${CPPFLAGS:N-Wp,-iremap,*} ${AFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} \
${__acpp_flags} ${.IMPSRC} && \
mv ${.TARGET}.tmp ${.TARGET}
@@ -86,7 +86,7 @@
${_MKTARGET_CREATE}
${MKDEPCXX} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
${CXXFLAGS:M-std=*} ${CXXFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
- ${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
+ ${CPPFLAGS:N-Wp,-iremap,*} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} && \
mv ${.TARGET}.tmp ${.TARGET}
Home |
Main Index |
Thread Index |
Old Index