From owner-svn-src-head@freebsd.org  Wed Sep 23 21:46:59 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 2DAC3A0798F;
 Wed, 23 Sep 2015 21:46:59 +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 1EDCA1238;
 Wed, 23 Sep 2015 21:46:59 +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 t8NLkwfj058112;
 Wed, 23 Sep 2015 21:46:58 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8NLkwxb058111;
 Wed, 23 Sep 2015 21:46:58 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201509232146.t8NLkwxb058111@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, 23 Sep 2015 21:46:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r288155 - 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, 23 Sep 2015 21:46:59 -0000

Author: bdrewery
Date: Wed Sep 23 21:46:58 2015
New Revision: 288155
URL: https://svnweb.freebsd.org/changeset/base/288155

Log:
  META_MODE: Follow-up r287865 and define CCACHE_DIR as realpath'd.
  
  Filemon(4) will record paths as they are seen, not as fully resolved.  make(1)
  will take the .MAKE.META.IGNORE_PATHS values and resolve them.  This creates
  a discrepancy if CCACHE_DIR is a symlink.  Fix this by ensuring it is
  resolved for its actual usage.
  
  Submitted by:	sjg

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

Modified: head/share/mk/local.meta.sys.mk
==============================================================================
--- head/share/mk/local.meta.sys.mk	Wed Sep 23 21:35:58 2015	(r288154)
+++ head/share/mk/local.meta.sys.mk	Wed Sep 23 21:46:58 2015	(r288155)
@@ -193,7 +193,9 @@ UPDATE_DEPENDFILE= NO
 .MAKE.META.BAILIWICK = ${SB} ${OBJROOT} ${STAGE_ROOT}
 
 .if defined(CCACHE_DIR)
+CCACHE_DIR := ${CCACHE_DIR:tA}
 .MAKE.META.IGNORE_PATHS += ${CCACHE_DIR}
+.export CCACHE_DIR
 .endif
 
 CSU_DIR.${MACHINE_ARCH} ?= csu/${MACHINE_ARCH}