Tue Mar 6 02:44:54 2012 UTC ()
Add CCACHE_COMPILERCHECK to the environment when using ccache.


(sbd)
diff -r1.32 -r1.33 pkgsrc/mk/compiler/ccache.mk
cvs diff -r1.32 -r1.33 pkgsrc/mk/compiler/ccache.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/ccache.mk 2009/08/31 08:38:50 1.32
+++ pkgsrc/mk/compiler/ccache.mk 2012/03/06 02:44:54 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: ccache.mk,v 1.32 2009/08/31 08:38:50 tnn Exp $ 1# $NetBSD: ccache.mk,v 1.33 2012/03/06 02:44:54 sbd Exp $
2# 2#
3# Copyright (c) 2004 The NetBSD Foundation, Inc. 3# Copyright (c) 2004 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -111,27 +111,27 @@ _ALIASES.CXX+= c++ @@ -111,27 +111,27 @@ _ALIASES.CXX+= c++
111PKG_CXX:= ${_CCACHE_CXX} 111PKG_CXX:= ${_CCACHE_CXX}
112. endif 112. endif
113 113
114PREPEND_PATH+= ${_CCACHE_DIR}/bin 114PREPEND_PATH+= ${_CCACHE_DIR}/bin
115 115
116# Add the dependency on ccache. 116# Add the dependency on ccache.
117. if ${CCACHE_BASE} == ${LOCALBASE} 117. if ${CCACHE_BASE} == ${LOCALBASE}
118BUILD_DEPENDS+= ccache-[0-9]*:../../devel/ccache 118BUILD_DEPENDS+= ccache-[0-9]*:../../devel/ccache
119. endif 119. endif
120 120
121# Override the compiler-specific hash with the version string for the 121# Override the compiler-specific hash with the version string for the
122# compiler. 122# compiler.
123# 123#
124PKGSRC_MAKE_ENV+= CCACHE_HASHCC=${CC_VERSION_STRING:Q} 124PKGSRC_MAKE_ENV+= CCACHE_COMPILERCHECK=echo\ ${CC_VERSION_STRING:Q}
125PKGSRC_MAKE_ENV+= CCACHE_DIR=${CCACHE_DIR:Q} 125PKGSRC_MAKE_ENV+= CCACHE_DIR=${CCACHE_DIR:Q}
126 126
127# Create symlinks for the compiler into ${WRKDIR}. 127# Create symlinks for the compiler into ${WRKDIR}.
128. for _var_ in ${_CCACHE_VARS} 128. for _var_ in ${_CCACHE_VARS}
129. if !target(${_CCACHE_${_var_}}) 129. if !target(${_CCACHE_${_var_}})
130override-tools: ${_CCACHE_${_var_}} 130override-tools: ${_CCACHE_${_var_}}
131${_CCACHE_${_var_}}: 131${_CCACHE_${_var_}}:
132 ${RUN}${MKDIR} ${.TARGET:H} 132 ${RUN}${MKDIR} ${.TARGET:H}
133 ${RUN} \ 133 ${RUN} \
134 ${LN} -fs ${CCACHE_BASE}/bin/ccache ${.TARGET} 134 ${LN} -fs ${CCACHE_BASE}/bin/ccache ${.TARGET}
135. for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//} 135. for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
136 ${RUN} \ 136 ${RUN} \
137 if [ ! -x "${_alias_}" ]; then \ 137 if [ ! -x "${_alias_}" ]; then \