From 8babcbebf4d9e5fb31202710dd56dee39c77a03f Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Sun, 20 Jun 2004 20:41:07 +0000
Subject: [PATCH] Don't include _CPUCFLAGS since the host compiler (aka NXCC)
 might not understand them. Add HOST_CCVER which replaces CCVER for NXCC and
 NXCXX. This defaults to CCVER, but can be overriden via environment e.g. from
 Makefile.inc1.

---
 share/mk/bsd.cpu.mk      | 3 ++-
 share/mk/bsd.hostprog.mk | 3 ++-
 share/mk/sys.mk          | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index df1c9d5468..1dc6324613 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -1,5 +1,5 @@
 # $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.2.2.5 2002/07/19 08:09:32 ru Exp $
-# $DragonFly: src/share/mk/bsd.cpu.mk,v 1.7 2004/06/15 07:53:32 joerg Exp $
+# $DragonFly: src/share/mk/bsd.cpu.mk,v 1.8 2004/06/20 20:41:07 joerg Exp $
 
 # include compiler-specific bsd.cpu.mk.  Note that CCVER may or may not
 # be passed as an environment variable.  If not set we make it consistent
@@ -8,6 +8,7 @@
 # _CCVER is used to detect changes to CCVER made in Makefile's after the
 # fact.
 CCVER ?= gcc2
+HOST_CCVER?= ${CCVER}
 _CCVER := ${CCVER}
 
 .if ${CCVER} == "gcc2"
diff --git a/share/mk/bsd.hostprog.mk b/share/mk/bsd.hostprog.mk
index 4488d80a63..22657b2b6d 100644
--- a/share/mk/bsd.hostprog.mk
+++ b/share/mk/bsd.hostprog.mk
@@ -1,7 +1,8 @@
-# $DragonFly: src/share/mk/bsd.hostprog.mk,v 1.2 2004/06/15 11:56:03 joerg Exp $
+# $DragonFly: src/share/mk/bsd.hostprog.mk,v 1.3 2004/06/20 20:41:07 joerg Exp $
 
 .include <bsd.init.mk>
 
+_CPUCLAGS=
 .SUFFIXES: .out .nx .no .c .cc .cpp .cxx .C .m .y .l .s .S
 
 .if defined(PROG_CXX)
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 9c08341ccb..62c4c27e97 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,6 +1,6 @@
 #	from: @(#)sys.mk	8.2 (Berkeley) 3/21/94
 # $FreeBSD: src/share/mk/sys.mk,v 1.45.2.6 2002/12/23 16:33:37 ru Exp $
-# $DragonFly: src/share/mk/sys.mk,v 1.9 2004/06/15 11:56:03 joerg Exp $
+# $DragonFly: src/share/mk/sys.mk,v 1.10 2004/06/20 20:41:07 joerg Exp $
 
 unix		?=	We run FreeBSD, not UNIX.
 
@@ -42,7 +42,7 @@ CC		?=	cc
 # The system cc frontend is not subject to the path, e.g. when buildworld
 # is doing cross compiles it may still need the native compiler for things.
 #
-NXENV		?=	OBJFORMAT_PATH=/ MAKEOBJDIRPREFIX= PATH=/usr/bin:/bin:/usr/sbin:/sbin
+NXENV		?=	CCVER=${HOST_CCVER} OBJFORMAT_PATH=/ PATH=/usr/bin:/bin:/usr/sbin:/sbin
 NXCC		?=	${NXENV} ${CC}
 CFLAGS		?=	-O -pipe
 
-- 
2.41.0