From owner-svn-src-head@freebsd.org  Wed Nov 11 23:52:10 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 1D831A2C56C;
 Wed, 11 Nov 2015 23:52:10 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 DC49213E6;
 Wed, 11 Nov 2015 23:52:09 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tABNq8AC095631;
 Wed, 11 Nov 2015 23:52:08 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tABNq86b095629;
 Wed, 11 Nov 2015 23:52:08 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201511112352.tABNq86b095629@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, 11 Nov 2015 23:52:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290691 - 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-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Nov 2015 23:52:10 -0000

Author: bdrewery
Date: Wed Nov 11 23:52:08 2015
New Revision: 290691
URL: https://svnweb.freebsd.org/changeset/base/290691

Log:
  Move META MODE's HOST_CC/CXX/CPP setting to local.meta.sys.mk, which
  centralizes the handling of CC and HOST_CC.
  
  This fixes a bug with WITH_CCACHE_BUILD when using MACHINE=host since
  CC is overridden in local.init.mk via src.opts.mk long before bsd.compiler.mk
  is included.
  
  Originally the ccache implementation was placed in local.init.mk but moved
  to bsd.compiler.mk as it seemed more proper and avoided other ordering
  issues.
  
  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 Nov 11 23:10:09 2015	(r290690)
+++ head/share/mk/local.init.mk	Wed Nov 11 23:52:08 2015	(r290691)
@@ -29,12 +29,6 @@ CXXFLAGS_LAST+= -I/usr/include
 .if ${.MAKE.DEPENDFILE:E} != "host"
 UPDATE_DEPENDFILE?= no
 .endif
-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
 CFLAGS+= ${HOST_CFLAGS}
 .endif

Modified: head/share/mk/local.meta.sys.mk
==============================================================================
--- head/share/mk/local.meta.sys.mk	Wed Nov 11 23:10:09 2015	(r290690)
+++ head/share/mk/local.meta.sys.mk	Wed Nov 11 23:52:08 2015	(r290691)
@@ -218,6 +218,15 @@ CPP?=		${HOST_CPP}
 .endif
 .endif
 
+.if ${MACHINE} == "host"
+HOST_CC?=	/usr/bin/cc
+CC=		${HOST_CC}
+HOST_CXX?=	/usr/bin/c++
+CXX=		${HOST_CXX}
+HOST_CPP?=	/usr/bin/cpp
+CPP=		${HOST_CPP}
+.endif
+
 .if ${MACHINE:Nhost:Ncommon} != "" && ${MACHINE} != ${HOST_MACHINE}
 # cross-building
 .if !defined(FREEBSD_REVISION)