[src/trunk]: src/share/mk Allow HOSTLIB to use C++ by not specifying -nostdin...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d393a9342747
branches:  trunk
changeset: 761713:d393a9342747
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sun Feb 06 00:52:49 2011 +0000

description:
Allow HOSTLIB to use C++ by not specifying -nostdinc++.

diffstat:

 share/mk/bsd.dep.mk |  6 +++---
 share/mk/bsd.lib.mk |  5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r a2f9f29baee4 -r d393a9342747 share/mk/bsd.dep.mk
--- a/share/mk/bsd.dep.mk       Sun Feb 06 00:44:08 2011 +0000
+++ b/share/mk/bsd.dep.mk       Sun Feb 06 00:52:49 2011 +0000
@@ -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)                                                 # }
diff -r a2f9f29baee4 -r d393a9342747 share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Sun Feb 06 00:44:08 2011 +0000
+++ b/share/mk/bsd.lib.mk       Sun Feb 06 00:52:49 2011 +0000
@@ -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