From 8c484219741d365bb53bfad107a2047e157487c5 Mon Sep 17 00:00:00 2001
From: schmonz <schmonz>
Date: Sun, 2 Jun 2002 00:40:18 +0000
Subject: Introduce CPP_PRECOMP_FLAGS, defaulting to "-no-cpp-precomp" on
 Darwin (meaning "don't use the OS X cpp that groks precompiled headers",
 which gets us the more compatible GNU cpp instead), and blank on other
 systems.

Approved by agc and yyamano.
---
 mk/bsd.pkg.mk     | 4 +++-
 mk/defs.Darwin.mk | 3 ++-
 mk/defs.Linux.mk  | 3 ++-
 mk/defs.NetBSD.mk | 3 ++-
 mk/defs.SunOS.mk  | 3 ++-
 5 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 068d9e7e286..c759289ecaf 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.985 2002/05/29 21:30:30 schmonz Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.986 2002/06/02 00:40:18 schmonz Exp $
 #
 # This file is in the public domain.
 #
@@ -269,6 +269,8 @@ LIBS+=		-L${LOCALBASE}/lib -lintl
 .  endif
 .endif
 
+CPPFLAGS+=	${CPP_PRECOMP_FLAGS}
+
 # If GNU_CONFIGURE is defined, then pass LIBS to the GNU configure script.
 # also pass in a CONFIG_SHELL to avoid picking up bash
 .if defined(GNU_CONFIGURE)
diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index 40ebd8c3c22..a2526b3081b 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.23 2002/05/19 12:44:59 schmonz Exp $
+# $NetBSD: defs.Darwin.mk,v 1.24 2002/06/02 00:40:18 schmonz Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -55,6 +55,7 @@ TYPE?=		type				# Shell builtin
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
 
+CPP_PRECOMP_FLAGS?=	-no-cpp-precomp	# use the GNU cpp, not the OS X cpp
 DEF_UMASK?=		0022
 DEFAULT_SERIAL_DEVICE?=	/dev/null
 GROUPADD?=		${FALSE}			# XXX - Fix me!
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index db9669a2d6e..8aebc45ba80 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.25 2002/04/09 22:15:41 jlam Exp $
+# $NetBSD: defs.Linux.mk,v 1.26 2002/06/02 00:40:19 schmonz Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -59,6 +59,7 @@ TYPE?=		type
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs -r
 
+CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		022
 DEFAULT_SERIAL_DEVICE?=	/dev/null
 GROUPADD?=		/usr/sbin/groupadd
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index 21a48e60d57..b569565da31 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.24 2002/04/09 22:15:41 jlam Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.25 2002/06/02 00:40:19 schmonz Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -66,6 +66,7 @@ DEPENDS+=	user>=20000313:../../sysutils/user
 .endif
 .endif
 
+CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 MOTIF_TYPE_DEFAULT?=	openmotif	# default 2.0 compatible libs type
 MOTIF12_TYPE_DEFAULT?=	lesstif12	# default 1.2 compatible libs type
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index 0afd6085caf..65ae46f571a 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.23 2002/04/09 22:15:41 jlam Exp $
+# $NetBSD: defs.SunOS.mk,v 1.24 2002/06/02 00:40:19 schmonz Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -66,6 +66,7 @@ TYPE?=		/usr/bin/type
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
 
+CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		022
 DEFAULT_SERIAL_DEVICE?=	/dev/null
 GROUPADD?=		/usr/sbin/groupadd
-- 
cgit v1.2.3