diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-02 11:04:17 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-02 11:04:17 +0000 |
| commit | 6f3185696f5e0d31b358dfd0644361b5f9b4a6c3 (patch) | |
| tree | ec0beff5c60c43eafcaf803c090348a647254c59 | |
| parent | 441289a9c089615b6b60fd9fb8e8734d7c0a8216 (diff) | |
| download | pkgsrc-6f3185696f5e0d31b358dfd0644361b5f9b4a6c3.tar.gz | |
Only prepend the compiler package location to the PATH if we actually
request a compiler that's supported by the named compiler package.
| -rw-r--r-- | mk/compiler/ccache.mk | 7 | ||||
| -rw-r--r-- | mk/compiler/distcc.mk | 7 | ||||
| -rw-r--r-- | mk/compiler/mipspro.mk | 6 | ||||
| -rw-r--r-- | mk/compiler/sunpro.mk | 6 |
4 files changed, 16 insertions, 10 deletions
diff --git a/mk/compiler/ccache.mk b/mk/compiler/ccache.mk index 84cef709c10..3b7c9c736bf 100644 --- a/mk/compiler/ccache.mk +++ b/mk/compiler/ccache.mk @@ -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 @@ _CCACHEBASE?= ${LOCALBASE} .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 --git a/mk/compiler/distcc.mk b/mk/compiler/distcc.mk index b166af4ca41..aa7507f49dd 100644 --- a/mk/compiler/distcc.mk +++ b/mk/compiler/distcc.mk @@ -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 @@ _DISTCCBASE?= ${LOCALBASE} .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 --git a/mk/compiler/mipspro.mk b/mk/compiler/mipspro.mk index b118dd7b311..e4a469fd888 100644 --- a/mk/compiler/mipspro.mk +++ b/mk/compiler/mipspro.mk @@ -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= # empty _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 --git a/mk/compiler/sunpro.mk b/mk/compiler/sunpro.mk index e7b9f839918..0d4a5946550 100644 --- a/mk/compiler/sunpro.mk +++ b/mk/compiler/sunpro.mk @@ -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= # empty _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 |