CPP_PRECOMP_FLAGS is a Darwinism only. Move its frobbing of CPPFLAGS to

platform/Darwin.mk (simplification).

12 files changed, 13 insertions, 23 deletions

diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index b873c44c37b..99f1bbefdb5 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
+# $NetBSD: AIX.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -118,7 +118,6 @@ DEPENDS+=	${USE_USERADD:D${_USER_DEPENDS}}
 DEPENDS+=	${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
-CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
 MOTIF_TYPE_DEFAULT?=	openmotif	# default 2.0 compatible libs type
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index 3b22328f835..cd065e3e91f 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
+# $NetBSD: BSDOS.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -98,7 +98,6 @@ XARGS?=		/usr/bin/xargs
 USERADD?=	/usr/sbin/adduser
 GROUPADD?=	/usr/sbin/addgroup
 
-CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 .if ${OBJECT_FMT} == "ELF"
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index c5c83ea6002..80e780dd0e0 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
+# $NetBSD: Darwin.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -87,6 +87,7 @@ XARGS?=		/usr/bin/xargs
 .if !defined(PKGSRC_COMPILER) || !empty(PKGSRC_COMPILER:Mgcc)
 CPP_PRECOMP_FLAGS?=	-no-cpp-precomp	# use the GNU cpp, not the OS X cpp
 .endif
+CPPFLAGS+=		${CPP_PRECOMP_FLAGS}
 DEF_UMASK?=		0022
 DEFAULT_SERIAL_DEVICE?=	/dev/null
 EXPORT_SYMBOLS_LDFLAGS?=	# Don't add symbols to the dynamic symbol table
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index 3ef53952ec4..9c9ec0b74b0 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.2 2004/11/02 22:24:35 wiz Exp $
+# $NetBSD: DragonFly.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -98,7 +98,6 @@ DEPENDS+=	${USE_USERADD:D${_USER_DEPENDS}}
 DEPENDS+=	${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
-CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 .if ${OBJECT_FMT} == "ELF"
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index 68b6845387f..3f5327fb8d6 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
+# $NetBSD: FreeBSD.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -98,7 +98,6 @@ DEPENDS+=	${USE_USERADD:D${_USER_DEPENDS}}
 DEPENDS+=	${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
-CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 .if ${OBJECT_FMT} == "ELF"
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index 69174d10799..0cabfb3c57e 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.4 2004/11/15 14:48:18 tv Exp $
+# $NetBSD: IRIX.mk,v 1.5 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -92,7 +92,6 @@ TYPE?=		/sbin/type
 WC?=		/sbin/wc
 XARGS?=		/sbin/xargs
 
-CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		022
 DEFAULT_SERIAL_DEVICE?=	/dev/null
 EXPORT_SYMBOLS_LDFLAGS?=	# Don't add symbols to the dynamic symbol table
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index 4f83dcc277f..49ac5c60d8b 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.10 2004/10/29 15:15:50 tv Exp $
+# $NetBSD: Interix.mk,v 1.11 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -111,7 +111,6 @@ _USER_DEPENDS=		user>=20040426:../../sysutils/user_interix
 DEPENDS+=		${USE_USERADD:D${_USER_DEPENDS}}
 DEPENDS+=		${USE_GROUPADD:D${_USER_DEPENDS}}
 
-CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		002
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
 
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index d608ba56599..d7ee5e100e7 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.3 2004/11/15 14:48:18 tv Exp $
+# $NetBSD: Linux.mk,v 1.4 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -129,7 +129,6 @@ TYPE?=		type			# Shell builtin
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs -r
 
-CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		022
 DEFAULT_SERIAL_DEVICE?=	/dev/null
 EXPORT_SYMBOLS_LDFLAGS?=	# Don't add symbols to the dynamic symbol table
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index 3728580d50c..dba242bd4cb 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.3 2004/11/11 22:29:40 tv Exp $
+# $NetBSD: NetBSD.mk,v 1.4 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -91,7 +91,6 @@ DEPENDS+=	${USE_USERADD:D${_USER_DEPENDS}}
 DEPENDS+=	${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
-CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 .if ${OBJECT_FMT} == "ELF"
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index 50ccd89a8c3..cea2e4b80a4 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
+# $NetBSD: OpenBSD.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -89,7 +89,6 @@ DEPENDS+=	${USE_USERADD:D${_USER_DEPENDS}}
 DEPENDS+=	${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
-CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 .if ${OBJECT_FMT} == "ELF"
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index 6388009fb9d..3a3218b3095 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.5 2004/11/15 14:48:18 tv Exp $
+# $NetBSD: SunOS.mk,v 1.6 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -90,7 +90,6 @@ TYPE?=		/usr/bin/type
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
 
-CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		022
 DEFAULT_SERIAL_DEVICE?=	/dev/null
 EXPORT_SYMBOLS_LDFLAGS?=	# Don't add symbols to the dynamic symbol table
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index 5fe951eb933..75ee4dcabca 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
+# $NetBSD: UnixWare.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -86,7 +86,6 @@ TYPE?=		/usr/bin/type
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
 
-CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		022
 DEFAULT_SERIAL_DEVICE?=	/dev/null
 EXPORT_SYMBOLS_LDFLAGS?=	# Don't add symbols to the dynamic symbol table