From owner-svn-src-all@freebsd.org  Wed Sep 30 23:14:24 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8AFD0A0B1EA;
 Wed, 30 Sep 2015 23:14:24 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7C0D71BD4;
 Wed, 30 Sep 2015 23:14:24 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8UNEOQi048151;
 Wed, 30 Sep 2015 23:14:24 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8UNEObc048149;
 Wed, 30 Sep 2015 23:14:24 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201509302314.t8UNEObc048149@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 30 Sep 2015 23:14:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r288432 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Sep 2015 23:14:24 -0000

Author: bdrewery
Date: Wed Sep 30 23:14:23 2015
New Revision: 288432
URL: https://svnweb.freebsd.org/changeset/base/288432

Log:
  META_MODE: Set HOST_CXX and HOST_CPP and chain them down into CXX/CPP for host builds.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/local.init.mk
  head/share/mk/local.meta.sys.mk

Modified: head/share/mk/local.init.mk
==============================================================================
--- head/share/mk/local.init.mk	Wed Sep 30 23:06:29 2015	(r288431)
+++ head/share/mk/local.init.mk	Wed Sep 30 23:14:23 2015	(r288432)
@@ -28,8 +28,12 @@ CXXFLAGS_LAST+= -I/usr/include
 .if ${.MAKE.DEPENDFILE:E} != "host"
 UPDATE_DEPENDFILE?= no
 .endif
-HOST_CC?= /usr/bin/cc
+HOST_CC?=	/usr/bin/cc
+CC=		${HOST_CC}
+HOST_CXX?=	/usr/bin/c++
+CXX=		${HOST_CXX}
+HOST_CPP?=	/usr/bin/cpp
+CPP=		${HOST_CPP}
 HOST_CFLAGS+= -DHOSTPROG
-CC= ${HOST_CC}
 CFLAGS+= ${HOST_CFLAGS}
 .endif

Modified: head/share/mk/local.meta.sys.mk
==============================================================================
--- head/share/mk/local.meta.sys.mk	Wed Sep 30 23:06:29 2015	(r288431)
+++ head/share/mk/local.meta.sys.mk	Wed Sep 30 23:14:23 2015	(r288432)
@@ -213,10 +213,13 @@ TOOLSDIR?= ${STAGE_HOST_OBJTOP}
 PATH:= ${PATH:S,:, ,g:@d@${exists(${TOOLSDIR}$d):?${TOOLSDIR}$d:}@:ts:}:${PATH}
 .export PATH
 .if exists(${TOOLSDIR}/usr/bin/cc)
-HOST_CC?= ${TOOLSDIR}/usr/bin/cc
-CC?= ${TOOLSDIR}/usr/bin/cc
-CXX?= ${TOOLSDIR}/usr/bin/c++
-.export HOST_CC CC CXX
+HOST_CC?=	${TOOLSDIR}/usr/bin/cc
+CC?=		${HOST_CC}
+HOST_CXX?=	${TOOLSDIR}/usr/bin/c++
+CXX?=		${HOST_CXX}
+HOST_CPP?=	${TOOLSDIR}/usr/bin/cpp
+CPP?=		${HOST_CPP}
+.export HOST_CC CC HOST_CXX CXX HOST_CPP CPP
 .endif
 .endif
 .endif