[pkgsrc/trunk]: pkgsrc/mk/compiler Only prepend the compiler package location...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/26e051c12285
branches:  trunk
changeset: 467531:26e051c12285
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Feb 02 11:04:17 2004 +0000

description:
Only prepend the compiler package location to the PATH if we actually
request a compiler that's supported by the named compiler package.

diffstat:

 mk/compiler/ccache.mk  |  7 ++++---
 mk/compiler/distcc.mk  |  7 ++++---
 mk/compiler/mipspro.mk |  6 ++++--
 mk/compiler/sunpro.mk  |  6 ++++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diffs (94 lines):

diff -r bec4662bc3fa -r 26e051c12285 mk/compiler/ccache.mk
--- a/mk/compiler/ccache.mk     Mon Feb 02 11:03:08 2004 +0000
+++ b/mk/compiler/ccache.mk     Mon Feb 02 11:04:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ccache.mk,v 1.4 2004/02/02 10:55:26 jlam Exp $
+# $NetBSD: ccache.mk,v 1.5 2004/02/02 11:04:17 jlam Exp $
 
 .if !defined(COMPILER_CCACHE_MK)
 COMPILER_CCACHE_MK=    defined
@@ -41,9 +41,10 @@
 
 .if exists(${_CCACHEBASE}/bin/ccache)
 _CCACHE_DIR=   ${WRKDIR}/.ccache
-PATH:=         ${_CCACHE_DIR}/bin:${PATH}
-
 _CCACHE_LINKS= # empty
+.  if !empty(_LANGUAGES.ccache)
+PATH:= ${_CCACHE_DIR}/bin:${PATH}
+.  endif
 .  if !empty(_LANGUAGES.ccache:Mc)
 CC:=   ${_CCACHE_DIR}/bin/${CC:T}
 _CCACHE_LINKS+=        CC
diff -r bec4662bc3fa -r 26e051c12285 mk/compiler/distcc.mk
--- a/mk/compiler/distcc.mk     Mon Feb 02 11:03:08 2004 +0000
+++ b/mk/compiler/distcc.mk     Mon Feb 02 11:04:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: distcc.mk,v 1.6 2004/02/02 11:03:08 jlam Exp $
+# $NetBSD: distcc.mk,v 1.7 2004/02/02 11:04:17 jlam Exp $
 
 .if !defined(COMPILER_DISTCC_MK)
 COMPILER_DISTCC_MK=    defined
@@ -41,9 +41,10 @@
 
 .if exists(${_DISTCCBASE}/bin/distcc)
 _DISTCC_DIR=   ${WRKDIR}/.distcc
-PATH:=         ${_DISTCC_DIR}/bin:${PATH}
-
 _DISTCC_LINKS= # empty
+.  if !empty(_LANGUAGES.distcc)
+PATH:= ${_DISTCC_DIR}/bin:${PATH}
+.  endif
 .  if !empty(_LANGUAGES.distcc:Mc)
 CC:=   ${_DISTCC_DIR}/bin/${CC:T}
 _DISTCC_LINKS+=        CC
diff -r bec4662bc3fa -r 26e051c12285 mk/compiler/mipspro.mk
--- a/mk/compiler/mipspro.mk    Mon Feb 02 11:03:08 2004 +0000
+++ b/mk/compiler/mipspro.mk    Mon Feb 02 11:04:17 2004 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: mipspro.mk,v 1.5 2004/02/02 10:03:46 jlam Exp $
+# $NetBSD: mipspro.mk,v 1.6 2004/02/02 11:04:17 jlam Exp $
 
 .if !defined(COMPILER_MIPSPRO_MK)
 COMPILER_MIPSPRO_MK=   defined
 
 MIPSPROBASE?=  /usr
-PATH:=         ${MIPSPROBASE}/bin:${PATH}
 
 # LANGUAGES.<compiler> is the list of supported languages by the compiler.
 # _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones
@@ -16,6 +15,9 @@
 _LANGUAGES.mipspro=    ${LANGUAGES.mipspro:M${_lang_}}
 .endfor
 
+.if !empty(_LANGUAGES.mipspro)
+PATH:= ${MIPSPROBASE}/bin:${PATH}
+.endif
 .if !empty(_LANGUAGES.mipspro:Mc)
 CC=    ${MIPSPROBASE}/bin/cc
 CPP=   ${MIPSPROBASE}/bin/cc -E
diff -r bec4662bc3fa -r 26e051c12285 mk/compiler/sunpro.mk
--- a/mk/compiler/sunpro.mk     Mon Feb 02 11:03:08 2004 +0000
+++ b/mk/compiler/sunpro.mk     Mon Feb 02 11:04:17 2004 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: sunpro.mk,v 1.3 2004/02/02 10:03:46 jlam Exp $
+# $NetBSD: sunpro.mk,v 1.4 2004/02/02 11:04:17 jlam Exp $
 
 .if !defined(COMPILER_SUNPRO_MK)
 COMPILER_SUNPRO_MK=    defined
 
 SUNWSPROBASE?= /opt/SUNWspro
-PATH:=         ${SUNWSPROBASE}/bin:${PATH}
 
 # LANGUAGES.<compiler> is the list of supported languages by the compiler.
 # _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones
@@ -16,6 +15,9 @@
 _LANGUAGES.sunpro=     ${LANGUAGES.sunpro:M${_lang_}}
 .endfor
 
+.if !empty(_LANGUAGES.sunpro)
+PATH:= ${SUNWSPROBASE}/bin:${PATH}
+.endif
 .if !empty(_LANGUAGES.sunpro:Mc)
 CC=    ${SUNWSPROBASE}/bin/cc
 CPP=   ${SUNWSPROBASE}/bin/cc -E