From 2e982d36acc02ac2a05c241d3d92ca99aaae031a Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 15 Feb 2004 13:34:33 +0000 Subject: 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. --- mk/compiler/gcc.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mk/compiler/gcc.mk') 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} -- cgit v1.2.3