From a81bf92f7d4c7777fbd95ddd54d8338abe195e2c Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Wed, 12 Jan 2005 16:41:14 +0000
Subject: 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.

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

(limited to 'mk')

diff --git a/mk/compiler/mipspro.mk b/mk/compiler/mipspro.mk
index 1a483cc80a5..e0e81c2bd7d 100644
--- a/mk/compiler/mipspro.mk
+++ b/mk/compiler/mipspro.mk
@@ -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 @@ _MIPSPRO_CC=		${_MIPSPRO_DIR}/bin/cc
 _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 @@ _MIPSPRO_CXX=		${_MIPSPRO_DIR}/bin/CC
 _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 --git a/mk/compiler/sunpro.mk b/mk/compiler/sunpro.mk
index f979b6cb6c9..3f92a37cf69 100644
--- a/mk/compiler/sunpro.mk
+++ b/mk/compiler/sunpro.mk
@@ -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 @@ _SUNPRO_CC=	${_SUNPRO_DIR}/bin/cc
 _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 @@ _SUNPRO_CXX=	${_SUNPRO_DIR}/bin/CC
 _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}
 
-- 
cgit v1.2.3