diff options
| author | jlam <jlam@pkgsrc.org> | 2005-01-12 17:30:34 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-01-12 17:30:34 +0000 |
| commit | 9e296c8b45c156217d3ad26a1ba95bb4f6886d5f (patch) | |
| tree | 6bc6861bfa2e576f1b884c8a93a1adeac00a7a22 /mk/compiler/sunpro.mk | |
| parent | 9d72ec198565f9ee13e76f47cb52a19e8230d783 (diff) | |
| download | pkgsrc-9e296c8b45c156217d3ad26a1ba95bb4f6886d5f.tar.gz | |
Backout part of previous commit that was unrelated.
Diffstat (limited to 'mk/compiler/sunpro.mk')
| -rw-r--r-- | mk/compiler/sunpro.mk | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/mk/compiler/sunpro.mk b/mk/compiler/sunpro.mk index 94f30e92f1a..7d17ae0d2c6 100644 --- a/mk/compiler/sunpro.mk +++ b/mk/compiler/sunpro.mk @@ -1,4 +1,4 @@ -# $NetBSD: sunpro.mk,v 1.28 2005/01/12 17:27:50 jlam Exp $ +# $NetBSD: sunpro.mk,v 1.29 2005/01/12 17:30:34 jlam Exp $ .if !defined(COMPILER_SUNPRO_MK) COMPILER_SUNPRO_MK= defined @@ -7,28 +7,31 @@ COMPILER_SUNPRO_MK= defined SUNWSPROBASE?= /opt/SUNWspro -# LANGUAGES.<compiler> is the list of supported languages by the -# compiler. +# LANGUAGES.<compiler> is the list of supported languages by the compiler. +# _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones +# requested by the package in USE_LANGUAGES. # -LANGUAGES.sunpro= # empty +LANGUAGES.sunpro= c c++ +_LANGUAGES.sunpro= # empty +.for _lang_ in ${USE_LANGUAGES} +_LANGUAGES.sunpro+= ${LANGUAGES.sunpro:M${_lang_}} +.endfor _SUNPRO_DIR= ${WRKDIR}/.sunpro _SUNPRO_VARS= # empty .if exists(${SUNWSPROBASE}/bin/cc) -LANGUAGES.sunpro+= c -_SUNPRO_VARS+= CC -_SUNPRO_CC= ${_SUNPRO_DIR}/bin/cc -_ALIASES.CC= cc -CCPATH= ${SUNWSPROBASE}/bin/cc -PKG_CC:= ${_SUNPRO_CC} +_SUNPRO_VARS+= CC +_SUNPRO_CC= ${_SUNPRO_DIR}/bin/cc +_ALIASES.CC= cc +CCPATH= ${SUNWSPROBASE}/bin/cc +PKG_CC:= ${_SUNPRO_CC} .endif .if exists(${SUNWSPROBASE}/bin/CC) -LANGUAGES.sunpro+= c++ -_SUNPRO_VARS+= CXX -_SUNPRO_CXX= ${_SUNPRO_DIR}/bin/CC -_ALIASES.CXX= CC c++ -CXXPATH= ${SUNWSPROBASE}/bin/CC -PKG_CXX:= ${_SUNPRO_CXX} +_SUNPRO_VARS+= CXX +_SUNPRO_CXX= ${_SUNPRO_DIR}/bin/CC +_ALIASES.CXX= CC c++ +CXXPATH= ${SUNWSPROBASE}/bin/CC +PKG_CXX:= ${_SUNPRO_CXX} .endif _COMPILER_STRIP_VARS+= ${_SUNPRO_VARS} @@ -49,14 +52,6 @@ CC_VERSION_STRING?= ${CC_VERSION} CC_VERSION?= cc: Sun C .endif -# _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the -# ones requested by the package in USE_LANGUAGES. -# -_LANGUAGES.sunpro= # empty -.for _lang_ in ${USE_LANGUAGES} -_LANGUAGES.sunpro+= ${LANGUAGES.sunpro:M${_lang_}} -.endfor - # Prepend the path to the compiler to the PATH. .if !empty(_LANGUAGES.sunpro) PREPEND_PATH+= ${_SUNPRO_DIR}/bin |