diff options
| -rw-r--r-- | mk/compiler/ccc.mk | 30 | ||||
| -rw-r--r-- | mk/compiler/xlc.mk | 6 |
2 files changed, 18 insertions, 18 deletions
diff --git a/mk/compiler/ccc.mk b/mk/compiler/ccc.mk index 783e36ba262..4de3fe95b7b 100644 --- a/mk/compiler/ccc.mk +++ b/mk/compiler/ccc.mk @@ -1,4 +1,4 @@ -# $NetBSD: ccc.mk,v 1.3 2004/11/23 00:46:26 dmcmahill Exp $ +# $NetBSD: ccc.mk,v 1.4 2004/11/23 05:24:28 jlam Exp $ .if !defined(COMPILER_CCC_MK) COMPILER_CCC_MK= defined @@ -10,31 +10,31 @@ COMPILER_CCC_MK= defined # requested by the package in USE_LANGUAGES. # -LANGUAGES.ccc= c +LANGUAGES.ccc= c .if exists(/usr/lib/cmplrs/cxx) -LANGUAGES.ccc+= c++ +LANGUAGES.ccc+= c++ .endif -_LANGUAGES.ccc= # empty +_LANGUAGES.ccc= # empty .for _lang_ in ${USE_LANGUAGES} _LANGUAGES.ccc+= ${LANGUAGES.ccc:M${_lang_}} .endfor -_CCC_DIR= ${WRKDIR}/.ccc -_CCC_LINKS= # empty +_CCC_DIR= ${WRKDIR}/.ccc +_CCC_LINKS= # empty .if exists(/usr/bin/cc) -_CCC_CC= ${_CCC_DIR}/cc +_CCC_CC= ${_CCC_DIR}/cc _CCC_LINKS+= _CCC_CC -PKG_CC= ${_CCC_CC} -CC= ${PKG_CC:T} -CCPATH= /usr/bin/cc +PKG_CC= ${_CCC_CC} +CC= ${PKG_CC:T} +CCPATH= /usr/bin/cc .endif .if exists(/usr/bin/cxx) -_CCC_CXX= ${_CCC_DIR}/cxx -_CCC_LINKS+= _CCC_CXX -PKG_CXX= ${_CCC_CXX} -CXX= ${PKG_CXX:T} -CXXPATH= /usr/bin/cxx +_CCC_CXX= ${_CCC_DIR}/cxx +_CCC_LINKS+= _CCC_CXX +PKG_CXX= ${_CCC_CXX} +CXX= ${PKG_CXX:T} +CXXPATH= /usr/bin/cxx .endif .if exists(/usr/bin/cc) && !defined(CC_VERSION_STRING) diff --git a/mk/compiler/xlc.mk b/mk/compiler/xlc.mk index b02d5a0555f..a9db9352153 100644 --- a/mk/compiler/xlc.mk +++ b/mk/compiler/xlc.mk @@ -1,4 +1,4 @@ -# $NetBSD: xlc.mk,v 1.3 2004/11/23 00:46:26 dmcmahill Exp $ +# $NetBSD: xlc.mk,v 1.4 2004/11/23 05:24:28 jlam Exp $ .if !defined(COMPILER_XLC_MK) COMPILER_XLC_MK= defined @@ -11,8 +11,8 @@ XLCBASE?= /opt/ibmcmp/vacpp/6.0 # _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones # requested by the package in USE_LANGUAGES. # -LANGUAGES.xlc= c c++ -_LANGUAGES.xlc= # empty +LANGUAGES.xlc= c c++ +_LANGUAGES.xlc= # empty .for _lang_ in ${USE_LANGUAGES} _LANGUAGES.xlc+= ${LANGUAGES.xlc:M${_lang_}} .endfor |