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.

2 files changed, 17 insertions, 27 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
diff --git a/mk/compiler/distcc.mk b/mk/compiler/distcc.mk
index ffbec8082c4..82119715aa3 100644
--- a/mk/compiler/distcc.mk
+++ b/mk/compiler/distcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: distcc.mk,v 1.19 2004/03/17 06:07:06 jlam Exp $
+# $NetBSD: distcc.mk,v 1.20 2004/11/17 17:14:43 tv Exp $
 
 .if !defined(COMPILER_DISTCC_MK)
 COMPILER_DISTCC_MK=	defined
@@ -32,25 +32,22 @@ _USE_DISTCC=	YES
 .endif
 
 .if !empty(_USE_DISTCC:M[yY][eE][sS])
-EVAL_PREFIX+=	_DISTCCBASE=distcc
+EVAL_PREFIX+=		_DISTCCBASE=distcc
 _DISTCCBASE_DEFAULT=	${LOCALBASE}
-_DISTCCBASE?=		${LOCALBASE}
 
-.  if exists(${_DISTCCBASE}/bin/distcc)
 _DISTCC_DIR=	${WRKDIR}/.distcc
 _DISTCC_LINKS=	# empty
-.    if !empty(_LANGUAGES.distcc:Mc)
+.  if !empty(_LANGUAGES.distcc:Mc)
 _DISTCC_CC:=	${_DISTCC_DIR}/bin/${PKG_CC:T}
 _DISTCC_LINKS+=	_DISTCC_CC
 PKG_CC:=	${_DISTCC_CC}
 CC=		${PKG_CC:T}
-.    endif
-.    if !empty(_LANGUAGES.distcc:Mc++)
+.  endif
+.  if !empty(_LANGUAGES.distcc:Mc++)
 _DISTCC_CXX:=	${_DISTCC_DIR}/bin/${PKG_CXX:T}
 _DISTCC_LINKS+=	_DISTCC_CXX
 PKG_CXX:=	${_DISTCC_CXX}
 CXX=		${PKG_CXX:T}
-.    endif
 .  endif
 
 # Prepend the path to the compiler to the PATH.
@@ -72,17 +69,15 @@ BUILD_ENV+=	DISTCC_VERBOSE=${DISTCC_VERBOSE:Q}
 .endif
 
 # Create symlinks for the compiler into ${WRKDIR}.
-.  if exists(${_DISTCCBASE}/bin/distcc)
-.    for _target_ in ${_DISTCC_LINKS}
-.      if !target(${${_target_}})
+.  for _target_ in ${_DISTCC_LINKS}
+.    if !target(${${_target_}})
 override-tools: ${${_target_}}
 ${${_target_}}:
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	${LN} -fs ${_DISTCCBASE}/bin/distcc ${.TARGET}
-.      endif
-.    endfor
-.  endif
+.    endif
+.  endfor
 .endif	# _USE_DISTCC == "yes"
 
 .endif # COMPILER_DISTCC_MK