[pkgsrc/trunk]: pkgsrc/mk/compiler Remove explicit overrides for CC and CXX t...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8fea9a34bb64
branches:  trunk
changeset: 487312:8fea9a34bb64
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jan 12 16:41:14 2005 +0000

description:
Remove explicit overrides for CC and CXX that prevented using the
definitions supplied in /etc/mk.conf.  It should now be possible to
pass optimization flags directly using CC and CXX when using SunPro
and MIPSpro compilers.

diffstat:

 mk/compiler/mipspro.mk |  8 +-------
 mk/compiler/sunpro.mk  |  8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diffs (58 lines):

diff -r 7d0e404ca36d -r 8fea9a34bb64 mk/compiler/mipspro.mk
--- a/mk/compiler/mipspro.mk    Wed Jan 12 16:10:01 2005 +0000
+++ b/mk/compiler/mipspro.mk    Wed Jan 12 16:41:14 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mipspro.mk,v 1.30 2005/01/12 15:32:01 jlam Exp $
+# $NetBSD: mipspro.mk,v 1.31 2005/01/12 16:41:14 jlam Exp $
 
 .if !defined(COMPILER_MIPSPRO_MK)
 COMPILER_MIPSPRO_MK=   defined
@@ -25,9 +25,6 @@
 _ALIASES.CC=           cc
 CCPATH=                        ${MIPSPROBASE}/bin/cc
 PKG_CC:=               ${_MIPSPRO_CC}
-.  if !empty(CC:M*gcc)
-CC:=                   ${PKG_CC:T}     # ${CC} should be named "cc".
-.  endif
 .endif
 .if exists(${MIPSPROBASE}/bin/CC)
 _MIPSPRO_VARS+=                CXX
@@ -35,9 +32,6 @@
 _ALIASES.CXX=          CC c++
 CXXPATH=               ${MIPSPROBASE}/bin/CC
 PKG_CXX:=              ${_MIPSPRO_CXX}
-.  if !empty(CXX:M*g++)
-CXX:=                  ${PKG_CXX:T}     # ${CXX} should be named "CC"
-.  endif
 .endif
 _COMPILER_STRIP_VARS+= ${_MIPSPRO_VARS}
 
diff -r 7d0e404ca36d -r 8fea9a34bb64 mk/compiler/sunpro.mk
--- a/mk/compiler/sunpro.mk     Wed Jan 12 16:10:01 2005 +0000
+++ b/mk/compiler/sunpro.mk     Wed Jan 12 16:41:14 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro.mk,v 1.26 2005/01/12 15:32:01 jlam Exp $
+# $NetBSD: sunpro.mk,v 1.27 2005/01/12 16:41:14 jlam Exp $
 
 .if !defined(COMPILER_SUNPRO_MK)
 COMPILER_SUNPRO_MK=    defined
@@ -25,9 +25,6 @@
 _ALIASES.CC=   cc
 CCPATH=                ${SUNWSPROBASE}/bin/cc
 PKG_CC:=       ${_SUNPRO_CC}
-.  if !empty(CC:M*gcc)
-CC:=           ${PKG_CC:T}     # ${CC} should be named "cc".
-.  endif
 .endif
 .if exists(${SUNWSPROBASE}/bin/CC)
 _SUNPRO_VARS+= CXX
@@ -35,9 +32,6 @@
 _ALIASES.CXX=  CC c++
 CXXPATH=       ${SUNWSPROBASE}/bin/CC
 PKG_CXX:=      ${_SUNPRO_CXX}
-.  if !empty(CXX:M*g++)
-CXX:=          ${PKG_CXX:T}    # ${CXX} should be named "CC".
-.  endif
 .endif
 _COMPILER_STRIP_VARS+= ${_SUNPRO_VARS}