Backout part of previous commit that was unrelated.

2 files changed, 29 insertions, 39 deletions

diff --git a/mk/compiler/mipspro.mk b/mk/compiler/mipspro.mk
index b37f746d618..3d64e72a952 100644
--- a/mk/compiler/mipspro.mk
+++ b/mk/compiler/mipspro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mipspro.mk,v 1.32 2005/01/12 17:27:50 jlam Exp $
+# $NetBSD: mipspro.mk,v 1.33 2005/01/12 17:30:34 jlam Exp $
 
 .if !defined(COMPILER_MIPSPRO_MK)
 COMPILER_MIPSPRO_MK=	defined
@@ -7,15 +7,19 @@ COMPILER_MIPSPRO_MK=	defined
 
 MIPSPROBASE?=	/usr
 
-# LANGUAGES.<compiler> is the list of supported languages by the
-# compiler.
-#
-LANGUAGES.mipspro=	# empty
+# 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.mipspro=	c c++
+_LANGUAGES.mipspro=	# empty
+.for _lang_ in ${USE_LANGUAGES}
+_LANGUAGES.mipspro+=	${LANGUAGES.mipspro:M${_lang_}}
+.endfor
 
 _MIPSPRO_DIR=		${WRKDIR}/.mipspro
 _MIPSPRO_VARS=		# empty
 .if exists(${MIPSPROBASE}/bin/cc)
-LANGUAGES.mipspro+=	c
 _MIPSPRO_VARS+=		CC
 _MIPSPRO_CC=		${_MIPSPRO_DIR}/bin/cc
 _ALIASES.CC=		cc
@@ -23,7 +27,6 @@ CCPATH=			${MIPSPROBASE}/bin/cc
 PKG_CC:=		${_MIPSPRO_CC}
 .endif
 .if exists(${MIPSPROBASE}/bin/CC)
-LANGUAGES.mipspro+=	c++
 _MIPSPRO_VARS+=		CXX
 _MIPSPRO_CXX=		${_MIPSPRO_DIR}/bin/CC
 _ALIASES.CXX=		CC c++
@@ -55,14 +58,6 @@ _COMPILER_ABI_FLAG.o32=	# empty
 _COMPILER_ABI_FLAG.n32=	-n32
 _COMPILER_ABI_FLAG.64=	-64
 
-# _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones
-# requested by the package in USE_LANGUAGES.
-# 
-_LANGUAGES.mipspro=	# empty
-.for _lang_ in ${USE_LANGUAGES}
-_LANGUAGES.mipspro+=	${LANGUAGES.mipspro:M${_lang_}}
-.endfor
-
 # Prepend the path to the compiler to the PATH.
 .if !empty(_LANGUAGES.mipspro)
 PREPEND_PATH+=	${_MIPSPRO_DIR}/bin
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