summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam>2004-02-21 12:31:38 +0000
committerjlam <jlam>2004-02-21 12:31:38 +0000
commite73dcdb854fd307d838d9e7c8e66118158e4d763 (patch)
tree7dfc8ca579a94d7ae5a6c9790a89a9e8103b5920 /mk
parenta23edf62a444b2669cc5b433971d3a7a7565ba82 (diff)
downloadpkgsrc-e73dcdb854fd307d838d9e7c8e66118158e4d763.tar.gz
Use BUILD_ENV instead of just {CONFIGURE,MAKE}_ENV to pass CCACHE_HASHCC
to ccache. This now correctly passes CCACHE_HASHCC to ccache if the package has a custom do-build target that invokes ${CC} directly.
Diffstat (limited to 'mk')
-rw-r--r--mk/compiler/ccache.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/mk/compiler/ccache.mk b/mk/compiler/ccache.mk
index 437870d7b2b..a490ecc4f36 100644
--- a/mk/compiler/ccache.mk
+++ b/mk/compiler/ccache.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ccache.mk,v 1.15 2004/02/18 13:32:38 jlam Exp $
+# $NetBSD: ccache.mk,v 1.16 2004/02/21 12:31:38 jlam Exp $
.if !defined(COMPILER_CCACHE_MK)
COMPILER_CCACHE_MK= defined
@@ -64,8 +64,7 @@ BUILD_DEPENDS+= ccache-[0-9]*:../../devel/ccache
# Override the compiler-specific hash with the version string for the
# compiler.
#
-CONFIGURE_ENV+= CCACHE_HASHCC=${CC_VERSION_STRING:Q}
-MAKE_ENV+= CCACHE_HASHCC=${CC_VERSION_STRING:Q}
+BUILD_ENV+= CCACHE_HASHCC=${CC_VERSION_STRING:Q}
# Create symlinks for the compiler into ${WRKDIR}.
. if exists(${_CCACHEBASE}/bin/ccache)