add {CC,CXX,FC,F77}PATH variables which give the complete path and

name of the {CC,CXX,FC,F77} compilers.  These will be used by pkgs
which need to know which compiler and where it is at run time.

Approved by jlam@

5 files changed, 17 insertions, 5 deletions

diff --git a/mk/compiler/ccc.mk b/mk/compiler/ccc.mk
index 5e503b2666b..783e36ba262 100644
--- a/mk/compiler/ccc.mk
+++ b/mk/compiler/ccc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ccc.mk,v 1.2 2004/11/20 05:54:36 grant Exp $
+# $NetBSD: ccc.mk,v 1.3 2004/11/23 00:46:26 dmcmahill Exp $
 
 .if !defined(COMPILER_CCC_MK)
 COMPILER_CCC_MK=	defined
@@ -26,6 +26,7 @@ _CCC_CC=		${_CCC_DIR}/cc
 _CCC_LINKS+=	_CCC_CC
 PKG_CC=			${_CCC_CC}
 CC=			${PKG_CC:T}
+CCPATH=			/usr/bin/cc
 .endif
 
 .if exists(/usr/bin/cxx)
@@ -33,6 +34,7 @@ _CCC_CXX=		${_CCC_DIR}/cxx
 _CCC_LINKS+=		_CCC_CXX
 PKG_CXX=		${_CCC_CXX}
 CXX=			${PKG_CXX:T}
+CXXPATH=		/usr/bin/cxx
 .endif
 
 .if exists(/usr/bin/cc) && !defined(CC_VERSION_STRING)
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index 26334089deb..9f20de73000 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.74 2004/11/22 22:24:47 wiz Exp $
+# $NetBSD: gcc.mk,v 1.75 2004/11/23 00:46:26 dmcmahill Exp $
 
 .if !defined(COMPILER_GCC_MK)
 COMPILER_GCC_MK=	defined
@@ -346,6 +346,7 @@ _GCC_CC=	${_GCC_DIR}/bin/gcc
 _GCC_LINKS+=	_GCC_CC
 PKG_CC=		${_GCC_CC}
 CC=		${PKG_CC:T}
+CCPATH=		${_GCCBINDIR}/gcc
 .endif
 .if exists(${_GCCBINDIR}/cpp) && ${OPSYS} != "Darwin"
 _GCC_CPP=	${_GCC_DIR}/bin/cpp
@@ -358,6 +359,7 @@ _GCC_CXX=	${_GCC_DIR}/bin/g++
 _GCC_LINKS+=	_GCC_CXX
 PKG_CXX=	${_GCC_CXX}
 CXX=		${PKG_CXX:T}
+CXXPATH=	${_GCCBINDIR}/g++
 .endif
 .if exists(${_GCCBINDIR}/g77)
 _GCC_FC=	${_GCC_DIR}/bin/g77
@@ -365,6 +367,8 @@ _GCC_LINKS+=	_GCC_FC
 PKG_FC=		${_GCC_FC}
 FC=		${PKG_FC:T}
 F77=		${PKG_FC:T}
+FCPATH=		${_GCCBINDIR}/g77
+F77PATH=	${_GCCBINDIR}/g77
 .endif
 
 # Pass the required flags to imake to tell it we're using gcc on Solaris.
diff --git a/mk/compiler/mipspro.mk b/mk/compiler/mipspro.mk
index cccaa5d6a53..9be1f9b4688 100644
--- a/mk/compiler/mipspro.mk
+++ b/mk/compiler/mipspro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mipspro.mk,v 1.26 2004/09/21 15:01:41 jlam Exp $
+# $NetBSD: mipspro.mk,v 1.27 2004/11/23 00:46:26 dmcmahill Exp $
 
 .if !defined(COMPILER_MIPSPRO_MK)
 COMPILER_MIPSPRO_MK=	defined
@@ -24,12 +24,14 @@ _MIPSPRO_CC=		${_MIPSPRO_DIR}/bin/cc
 _MIPSPRO_LINKS+=	_MIPSPRO_CC
 PKG_CC=			${_MIPSPRO_CC}
 CC=			${PKG_CC:T}
+CCPATH=			${MIPSPROBASE}/bin/cc
 .endif
 .if exists(${MIPSPROBASE}/bin/CC)
 _MIPSPRO_CXX=		${_MIPSPRO_DIR}/bin/CC
 _MIPSPRO_LINKS+=	_MIPSPRO_CXX
 PKG_CXX=		${_MIPSPRO_CXX}
 CXX=			${PKG_CXX:T}
+CXXPATH=		${MIPSPROBASE}/bin/CC
 .endif
 
 .if exists(${MIPSPROBASE}/bin/cc)
diff --git a/mk/compiler/sunpro.mk b/mk/compiler/sunpro.mk
index 9bd69b67e7e..1ad96a3c362 100644
--- a/mk/compiler/sunpro.mk
+++ b/mk/compiler/sunpro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro.mk,v 1.22 2004/09/21 15:01:41 jlam Exp $
+# $NetBSD: sunpro.mk,v 1.23 2004/11/23 00:46:26 dmcmahill Exp $
 
 .if !defined(COMPILER_SUNPRO_MK)
 COMPILER_SUNPRO_MK=	defined
@@ -24,12 +24,14 @@ _SUNPRO_CC=	${_SUNPRO_DIR}/bin/cc
 _SUNPRO_LINKS+=	_SUNPRO_CC
 PKG_CC=		${_SUNPRO_CC}
 CC=		${PKG_CC:T}
+CCPATH=		${SUNWSPROBASE}/bin/cc
 .endif
 .if exists(${SUNWSPROBASE}/bin/CC)
 _SUNPRO_CXX=	${_SUNPRO_DIR}/bin/CC
 _SUNPRO_LINKS+=	_SUNPRO_CXX
 PKG_CXX=	${_SUNPRO_CXX}
 CXX=		${PKG_CXX:T}
+CXXPATH=	${SUNWSPROBASE}/bin/CC
 .endif
 
 # SunPro passes rpath directives to the linker using "-R".
diff --git a/mk/compiler/xlc.mk b/mk/compiler/xlc.mk
index 2ab19194572..b02d5a0555f 100644
--- a/mk/compiler/xlc.mk
+++ b/mk/compiler/xlc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xlc.mk,v 1.2 2004/10/06 13:56:46 grant Exp $
+# $NetBSD: xlc.mk,v 1.3 2004/11/23 00:46:26 dmcmahill Exp $
 
 .if !defined(COMPILER_XLC_MK)
 COMPILER_XLC_MK=	defined
@@ -24,12 +24,14 @@ _XLC_CC=	${_XLC_DIR}/bin/xlc
 _XLC_LINKS+=	_XLC_CC
 PKG_CC=		${_XLC_CC}
 CC=		${PKG_CC:T}
+CCPATH=		${XLCBASE}/bin/xlc
 .endif
 .if exists(${XLCBASE}/bin/xlc++)
 _XLC_CXX=	${_XLC_DIR}/bin/xlc++
 _XLC_LINKS+=	_XLC_CXX
 PKG_CXX=	${_XLC_CXX}
 CXX=		${PKG_CXX:T}
+CXXPATH=	${XLCBASE}/bin/xlc++
 .endif
 
 .if exists(${XLCBASE}/bin/xlc)