diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-15 13:34:33 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-15 13:34:33 +0000 |
| commit | f9efcd51485f9c01bff22b1b0997d1754fe785e2 (patch) | |
| tree | 9d3b21de3c071723a585d256f02d6e0e91ec960a /mk/compiler | |
| parent | 08c84c1a2ddb3e889cf105cb2b713034c8952ffa (diff) | |
| download | pkgsrc-f9efcd51485f9c01bff22b1b0997d1754fe785e2.tar.gz | |
Create wrappers for the compilers for every language supported by the
compiler set. This will cause the libtool configuration found in several
packages to use the correct C++ compiler even though the package doesn't
use C++. This was causing bugs when CXXFLAGS contained flags not
understood by the system gcc-2.95.3.
Diffstat (limited to 'mk/compiler')
| -rw-r--r-- | mk/compiler/gcc.mk | 10 | ||||
| -rw-r--r-- | mk/compiler/mipspro.mk | 6 | ||||
| -rw-r--r-- | mk/compiler/sunpro.mk | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index 62b21fd64a5..75f7d5cb3bd 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.51 2004/02/12 08:54:48 jlam Exp $ +# $NetBSD: gcc.mk,v 1.52 2004/02/15 13:34:33 jlam Exp $ .if !defined(COMPILER_GCC_MK) COMPILER_GCC_MK= one @@ -256,25 +256,25 @@ _GCCBINDIR= ${_GCC_PREFIX}bin . elif !empty(_IS_BUILTIN_GCC:M[yY][eE][sS]) _GCCBINDIR= ${_CC:H} . endif -. if exists(${_GCCBINDIR}/gcc) && !empty(_LANGUAGES.gcc:Mc) +. if exists(${_GCCBINDIR}/gcc) _GCC_CC= ${_GCC_DIR}/bin/gcc _GCC_LINKS+= _GCC_CC PKG_CC= ${_GCC_CC} CC= ${PKG_CC:T} . endif -. if exists(${_GCCBINDIR}/cpp) && !empty(_LANGUAGES.gcc:Mc) +. if exists(${_GCCBINDIR}/cpp) _GCC_CPP= ${_GCC_DIR}/bin/cpp _GCC_LINKS+= _GCC_CPP PKG_CPP= ${_GCC_CPP} CPP= ${PKG_CPP:T} . endif -. if exists(${_GCCBINDIR}/g++) && !empty(_LANGUAGES.gcc:Mc++) +. if exists(${_GCCBINDIR}/g++) _GCC_CXX= ${_GCC_DIR}/bin/g++ _GCC_LINKS+= _GCC_CXX PKG_CXX= ${_GCC_CXX} CXX= ${PKG_CXX:T} . endif -. if exists(${_GCCBINDIR}/g77) && !empty(_LANGUAGES.gcc:Mfortran) +. if exists(${_GCCBINDIR}/g77) _GCC_FC= ${_GCC_DIR}/bin/g77 _GCC_LINKS+= _GCC_FC PKG_FC= ${_GCC_FC} diff --git a/mk/compiler/mipspro.mk b/mk/compiler/mipspro.mk index e263f92bb6b..add6d568105 100644 --- a/mk/compiler/mipspro.mk +++ b/mk/compiler/mipspro.mk @@ -1,4 +1,4 @@ -# $NetBSD: mipspro.mk,v 1.19 2004/02/12 21:37:08 jlam Exp $ +# $NetBSD: mipspro.mk,v 1.20 2004/02/15 13:34:33 jlam Exp $ .if !defined(COMPILER_MIPSPRO_MK) COMPILER_MIPSPRO_MK= one @@ -17,13 +17,13 @@ _LANGUAGES.mipspro+= ${LANGUAGES.mipspro:M${_lang_}} _MIPSPRO_DIR= ${WRKDIR}/.mipspro _MIPSPRO_LINKS= # empty -. if !empty(_LANGUAGES.mipspro:Mc) +. if exists(${MIPSPROBASE}/bin/cc) _MIPSPRO_CC= ${_MIPSPRO_DIR}/bin/cc _MIPSPRO_LINKS+= _MIPSPRO_CC PKG_CC= ${_MIPSPRO_CC} CC= ${PKG_CC:T} . endif -. if !empty(_LANGUAGES.mipspro:Mc++) +. if exists(${MIPSPROBASE}/bin/CC) _MIPSPRO_CXX= ${_MIPSPRO_DIR}/bin/CC _MIPSPRO_LINKS+= _MIPSPRO_CXX PKG_CXX= ${_MIPSPRO_CXX} diff --git a/mk/compiler/sunpro.mk b/mk/compiler/sunpro.mk index 12522a4a5e4..deb2721bd18 100644 --- a/mk/compiler/sunpro.mk +++ b/mk/compiler/sunpro.mk @@ -1,4 +1,4 @@ -# $NetBSD: sunpro.mk,v 1.17 2004/02/12 21:37:08 jlam Exp $ +# $NetBSD: sunpro.mk,v 1.18 2004/02/15 13:34:33 jlam Exp $ .if !defined(COMPILER_SUNPRO_MK) COMPILER_SUNPRO_MK= one @@ -17,13 +17,13 @@ _LANGUAGES.sunpro+= ${LANGUAGES.sunpro:M${_lang_}} _SUNPRO_DIR= ${WRKDIR}/.sunpro _SUNPRO_LINKS= # empty -. if !empty(_LANGUAGES.sunpro:Mc) +. if exists(${SUNWSPROBASE}/bin/cc) _SUNPRO_CC= ${_SUNPRO_DIR}/bin/cc _SUNPRO_LINKS+= _SUNPRO_CC PKG_CC= ${_SUNPRO_CC} CC= ${PKG_CC:T} . endif -. if !empty(_LANGUAGES.sunpro:Mc++) +. if exists(${SUNWSPROBASE}/bin/CC) _SUNPRO_CXX= ${_SUNPRO_DIR}/bin/CC _SUNPRO_LINKS+= _SUNPRO_CXX PKG_CXX= ${_SUNPRO_CXX} |