Module Name: src
Committed By: tsutsui
Date: Fri Nov 27 11:44:36 UTC 2009
Modified Files:
src/share/mk: bsd.lib.mk bsd.prog.mk
Log Message:
If CPPFLAGS or CXXFLAGS already contains -nostdinc or -nostdinc++,
don't add ${CPPFLAGS_ISYSTEM} or ${CPPFLAGS_ISYSTEMXX} to refer
${DESTDIR}/usr/include or ${DESTDIR}/usr/include/g++.
This change might cause errors on some MD stand dir, but in that case
each Makefile should be fixed to search proper system include paths
by -Ipath option in own CPPFLAGS.
To generate a diff of this commit:
cvs rdiff -u -r1.298 -r1.299 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.242 -r1.243 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.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.298 src/share/mk/bsd.lib.mk:1.299
--- src/share/mk/bsd.lib.mk:1.298 Fri Apr 10 16:16:12 2009
+++ src/share/mk/bsd.lib.mk Fri Nov 27 11:44:36 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.298 2009/04/10 16:16:12 apb Exp $
+# $NetBSD: bsd.lib.mk,v 1.299 2009/11/27 11:44:36 tsutsui Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -72,9 +72,13 @@
# Use purely kernel private headers in rump builds
.if !defined(RUMPKERNEL)
+.if empty(CPPFLAGS:M-nostdinc)
CPPFLAGS+= ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}
+.endif
+.if empty(CXXFLAGS:M-nostdinc++)
CXXFLAGS+= ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}
.endif
+.endif
.if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE}) # {
SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.242 src/share/mk/bsd.prog.mk:1.243
--- src/share/mk/bsd.prog.mk:1.242 Tue May 12 18:07:54 2009
+++ src/share/mk/bsd.prog.mk Fri Nov 27 11:44:36 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.242 2009/05/12 18:07:54 plunky Exp $
+# $NetBSD: bsd.prog.mk,v 1.243 2009/11/27 11:44:36 tsutsui Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -53,8 +53,12 @@
.endif
##### Default values
+.if empty(CPPFLAGS:M-nostdinc)
CPPFLAGS+= ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}
+.endif
+.if empty(CXXFLAGS:M-nostdinc++)
CXXFLAGS+= ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}
+.endif
CFLAGS+= ${COPTS}
OBJCFLAGS+= ${OBJCOPTS}
MKDEP_SUFFIXES?= .o .ln
