diff options
| author | tv <tv> | 2004-11-17 17:14:43 +0000 |
|---|---|---|
| committer | tv <tv> | 2004-11-17 17:14:43 +0000 |
| commit | 892a299178be539f0a3d9c70ef69a7d25b948f2d (patch) | |
| tree | c0b8138eb678e7a63453d75123b5d9a57f6914d8 /mk/compiler/ccache.mk | |
| parent | 114db2e677bad770cd1833bf9cb7a5c473eb94f0 (diff) | |
| download | pkgsrc-892a299178be539f0a3d9c70ef69a7d25b948f2d.tar.gz | |
Don't check _*PREFIX/bin for the requested compiler hook program. If
PKGSRC_COMPILER requested it, assume that it's available, so that
compilation will (properly) fail if the hook program is somehow not
correctly installed.
Diffstat (limited to 'mk/compiler/ccache.mk')
| -rw-r--r-- | mk/compiler/ccache.mk | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/mk/compiler/ccache.mk b/mk/compiler/ccache.mk index 3af41d65a63..6dff2912a8a 100644 --- a/mk/compiler/ccache.mk +++ b/mk/compiler/ccache.mk @@ -1,4 +1,4 @@ -# $NetBSD: ccache.mk,v 1.18 2004/10/09 03:48:31 tv Exp $ +# $NetBSD: ccache.mk,v 1.19 2004/11/17 17:14:43 tv Exp $ .if !defined(COMPILER_CCACHE_MK) COMPILER_CCACHE_MK= defined @@ -34,23 +34,20 @@ _USE_CCACHE= YES .if !empty(_USE_CCACHE:M[yY][eE][sS]) EVAL_PREFIX+= _CCACHEBASE=ccache _CCACHEBASE_DEFAULT= ${LOCALBASE} -_CCACHEBASE?= ${LOCALBASE} -. if exists(${_CCACHEBASE}/bin/ccache) _CCACHE_DIR= ${WRKDIR}/.ccache _CCACHE_LINKS= # empty -. if !empty(_LANGUAGES.ccache:Mc) +. if !empty(_LANGUAGES.ccache:Mc) _CCACHE_CC:= ${_CCACHE_DIR}/bin/${PKG_CC:T} _CCACHE_LINKS+= _CCACHE_CC PKG_CC:= ${_CCACHE_CC} CC= ${PKG_CC:T} -. endif -. if !empty(_LANGUAGES.ccache:Mc++) +. endif +. if !empty(_LANGUAGES.ccache:Mc++) _CCACHE_CXX:= ${_CCACHE_DIR}/bin/${PKG_CXX:T} _CCACHE_LINKS+= _CCACHE_CXX PKG_CXX:= ${_CCACHE_CXX} CXX= ${PKG_CXX:T} -. endif . endif # Prepend the path the to the compiler to the PATH @@ -71,17 +68,15 @@ BUILD_ENV+= CCACHE_DIR=${CCACHE_DIR:Q} .endif # Create symlinks for the compiler into ${WRKDIR}. -. if exists(${_CCACHEBASE}/bin/ccache) -. for _target_ in ${_CCACHE_LINKS} -. if !target(${${_target_}}) +. for _target_ in ${_CCACHE_LINKS} +. if !target(${${_target_}}) override-tools: ${${_target_}} ${${_target_}}: ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} ${_PKG_SILENT}${_PKG_DEBUG} \ ${LN} -fs ${_CCACHEBASE}/bin/ccache ${.TARGET} -. endif -. endfor -. endif +. endif +. endfor .endif # _USE_CCACHE == "yes" .endif # COMPILER_CCACHE_MK |