Module Name: src
Committed By: joerg
Date: Sun Feb 6 00:52:49 UTC 2011
Modified Files:
src/share/mk: bsd.dep.mk bsd.lib.mk
Log Message:
Allow HOSTLIB to use C++ by not specifying -nostdinc++.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/share/mk/bsd.dep.mk
cvs rdiff -u -r1.310 -r1.311 src/share/mk/bsd.lib.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.dep.mk
diff -u src/share/mk/bsd.dep.mk:1.70 src/share/mk/bsd.dep.mk:1.71
--- src/share/mk/bsd.dep.mk:1.70 Wed Jan 12 23:12:11 2011
+++ src/share/mk/bsd.dep.mk Sun Feb 6 00:52:49 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.dep.mk,v 1.70 2011/01/12 23:12:11 joerg Exp $
+# $NetBSD: bsd.dep.mk,v 1.71 2011/02/06 00:52:49 joerg Exp $
##### Basic targets
cleandir: cleandepend
@@ -57,8 +57,8 @@
${_MKTARGET_CREATE}
${MKDEP} -f ${.TARGET} -- ${MKDEPFLAGS} \
${CXXFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
- ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} \
- ${DESTDIR}/usr/include/g++} \
+ ${HOSTLIB:U${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} \
+ ${DESTDIR}/usr/include/g++}} \
${CPPFLAGS} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
.endif # defined(SRCS) # }
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.310 src/share/mk/bsd.lib.mk:1.311
--- src/share/mk/bsd.lib.mk:1.310 Wed Dec 8 01:57:22 2010
+++ src/share/mk/bsd.lib.mk Sun Feb 6 00:52:49 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.310 2010/12/08 01:57:22 joerg Exp $
+# $NetBSD: bsd.lib.mk,v 1.311 2011/02/06 00:52:49 joerg Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -64,7 +64,8 @@
MKDEP_SUFFIXES?= .o .po .pico .go .ln
# Use purely kernel private headers in rump builds
-.if !defined(RUMPKERNEL)
+# Skip NetBSD headers for the toolchain builds
+.if !defined(RUMPKERNEL) && !defined(HOSTLIB)
.if empty(CPPFLAGS:M-nostdinc)
CPPFLAGS+= ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}
.endif
