* Let CC/CXX/CPP/FC always point to the compiler used in the actual

  building of software.  For packages that use either buildlink2 or
  buildlink3, this would be the wrapper script in ${BUILDLINK_DIR}.

* Garbage-collect _BLNK_WRAP_SETENV.* as those are not needed after
  the above changes.  Configure and make processes will automatically
  find the right compilers in the PATH.

* PKGLIBTOOL and PKGSHLIBTOOL are no longer needed since LIBTOOL and
  SHLIBTOOL point to the correct libtools regardless of any
  USE_BUILDLINK[23] definitions.

5 files changed, 39 insertions, 26 deletions

diff --git a/mk/compiler/ccache.mk b/mk/compiler/ccache.mk
index b4f94070624..762b0dbe13d 100644
--- a/mk/compiler/ccache.mk
+++ b/mk/compiler/ccache.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ccache.mk,v 1.11 2004/02/07 02:58:10 jlam Exp $
+# $NetBSD: ccache.mk,v 1.12 2004/02/08 02:59:14 jlam Exp $
 
 .if !defined(COMPILER_CCACHE_MK)
 COMPILER_CCACHE_MK=	one
@@ -38,14 +38,16 @@ _CCACHEBASE?=		${LOCALBASE}
 _CCACHE_DIR=	${WRKDIR}/.ccache
 _CCACHE_LINKS=	# empty
 .      if !empty(_LANGUAGES.ccache:Mc)
-_CCACHE_CC:=	${_CCACHE_DIR}/bin/${CC:T}
+_CCACHE_CC:=	${_CCACHE_DIR}/bin/${PKG_CC:T}
 _CCACHE_LINKS+=	_CCACHE_CC
-CC=		${_CCACHE_CC}
+PKG_CC=		${_CCACHE_CC}
+CC=		${PKG_CC:T}
 .      endif
 .      if !empty(_LANGUAGES.ccache:Mc++)
-_CCACHE_CXX:=	${_CCACHE_DIR}/bin/${CXX:T}
+_CCACHE_CXX:=	${_CCACHE_DIR}/bin/${PKG_CXX:T}
 _CCACHE_LINKS+=	_CCACHE_CXX
-CXX=		${_CCACHE_CXX}
+PKG_CXX=	${_CCACHE_CXX}
+CXX=		${PKG_CXX:T}
 .      endif
 .    endif
 .  endif
diff --git a/mk/compiler/distcc.mk b/mk/compiler/distcc.mk
index fbac7e071a4..12f3d36f1eb 100644
--- a/mk/compiler/distcc.mk
+++ b/mk/compiler/distcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: distcc.mk,v 1.14 2004/02/07 02:58:10 jlam Exp $
+# $NetBSD: distcc.mk,v 1.15 2004/02/08 02:59:14 jlam Exp $
 
 .if !defined(COMPILER_DISTCC_MK)
 COMPILER_DISTCC_MK=	one
@@ -38,14 +38,16 @@ _DISTCCBASE?=		${LOCALBASE}
 _DISTCC_DIR=	${WRKDIR}/.distcc
 _DISTCC_LINKS=	# empty
 .      if !empty(_LANGUAGES.distcc:Mc)
-_DISTCC_CC:=	${_DISTCC_DIR}/bin/${CC:T}
+_DISTCC_CC:=	${_DISTCC_DIR}/bin/${PKG_CC:T}
 _DISTCC_LINKS+=	_DISTCC_CC
-CC=		${_DISTCC_CC}
+PKG_CC=		${_DISTCC_CC}
+CC=		${PKG_CC:T}
 .      endif
 .      if !empty(_LANGUAGES.distcc:Mc++)
-_DISTCC_CXX:=	${_DISTCC_DIR}/bin/${CXX:T}
+_DISTCC_CXX:=	${_DISTCC_DIR}/bin/${PKG_CXX:T}
 _DISTCC_LINKS+=	_DISTCC_CXX
-CXX=		${_DISTCC_CXX}
+PKG_CXX=	${_DISTCC_CXX}
+CXX=		${PKG_CXX:T}
 .      endif
 .    endif
 .  endif
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index 18806733ed7..1bb6992f098 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.44 2004/02/07 02:58:10 jlam Exp $
+# $NetBSD: gcc.mk,v 1.45 2004/02/08 02:59:14 jlam Exp $
 
 .if !defined(COMPILER_GCC_MK)
 COMPILER_GCC_MK=	one
@@ -258,23 +258,26 @@ _GCCBINDIR=	${_CC:H}
 .  if exists(${_GCCBINDIR}/gcc) && !empty(_LANGUAGES.gcc:Mc)
 _GCC_CC=	${_GCC_DIR}/bin/gcc
 _GCC_LINKS+=	_GCC_CC
-CC=		${_GCC_CC}
+PKG_CC=		${_GCC_CC}
+CC=		${PKG_CC:T}
 .  endif
 .  if exists(${_GCCBINDIR}/cpp) && !empty(_LANGUAGES.gcc:Mc)
 _GCC_CPP=	${_GCC_DIR}/bin/cpp
 _GCC_LINKS+=	_GCC_CPP
-CPP=		${_GCC_CPP}
+PKG_CPP=	${_GCC_CPP}
+CPP=		${PKG_CPP:T}
 .  endif
 .  if exists(${_GCCBINDIR}/g++) && !empty(_LANGUAGES.gcc:Mc++)
 _GCC_CXX=	${_GCC_DIR}/bin/g++
 _GCC_LINKS+=	_GCC_CXX
-CXX=		${_GCC_CXX}
+PKG_CXX=	${_GCC_CXX}
+CXX=		${PKG_CXX:T}
 .  endif
 .  if exists(${_GCCBINDIR}/g77) && !empty(_LANGUAGES.gcc:Mfortran)
-_GCC_F77=	${_GCC_DIR}/bin/g77
-_GCC_LINKS+=	_GCC_F77
-F77=		${_GCC_F77}
-PKG_FC:=	${F77}
+_GCC_FC=	${_GCC_DIR}/bin/g77
+_GCC_LINKS+=	_GCC_FC
+PKG_FC=		${_GCC_FC}
+FC=		${PKG_FC:T}
 .  endif
 
 # GCC passes flags to the linker using "-Wl,".
diff --git a/mk/compiler/mipspro.mk b/mk/compiler/mipspro.mk
index 186ac74b027..bf3d1a3862f 100644
--- a/mk/compiler/mipspro.mk
+++ b/mk/compiler/mipspro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mipspro.mk,v 1.14 2004/02/07 02:58:10 jlam Exp $
+# $NetBSD: mipspro.mk,v 1.15 2004/02/08 02:59:14 jlam Exp $
 
 .if !defined(COMPILER_MIPSPRO_MK)
 COMPILER_MIPSPRO_MK=	one
@@ -20,13 +20,16 @@ _MIPSPRO_LINKS=		# empty
 .  if !empty(_LANGUAGES.mipspro:Mc)
 _MIPSPRO_CC=		${_MIPSPRO_DIR}/bin/cc
 _MIPSPRO_LINKS+=	_MIPSPRO_CC
-CC=			${_MIPSPRO_CC}
-CPP=			${_MIPSPRO_CC} -E
+PKG_CC=			${_MIPSPRO_CC}
+PKG_CPP=		${_MIPSPRO_CC} -E
+CC=			${PKG_CC:T}
+CPP=			${PKG_CPP:T}
 .  endif
 .  if !empty(_LANGUAGES.mipspro:Mc++)
 _MIPSPRO_CXX=		${_MIPSPRO_DIR}/bin/CC
 _MIPSPRO_LINKS+=	_MIPSPRO_CXX
-CXX=			${_MIPSPRO_CXX}
+PKG_CXX=		${_MIPSPRO_CXX}
+CXX=			${PKG_CXX:T}
 .  endif
 
 .  if exists(${MIPSPROBASE}/bin/cc)
diff --git a/mk/compiler/sunpro.mk b/mk/compiler/sunpro.mk
index 162d06cbfb7..a17fa0c7a9c 100644
--- a/mk/compiler/sunpro.mk
+++ b/mk/compiler/sunpro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro.mk,v 1.11 2004/02/07 02:58:10 jlam Exp $
+# $NetBSD: sunpro.mk,v 1.12 2004/02/08 02:59:14 jlam Exp $
 
 .if !defined(COMPILER_SUNPRO_MK)
 COMPILER_SUNPRO_MK=	one
@@ -20,13 +20,16 @@ _SUNPRO_LINKS=	# empty
 .  if !empty(_LANGUAGES.sunpro:Mc)
 _SUNPRO_CC=	${_SUNPRO_DIR}/bin/cc
 _SUNPRO_LINKS+=	_SUNPRO_CC
-CC=		${_SUNPRO_CC}
-CPP=		${_SUNPRO_CC} -E
+PKG_CC=		${_SUNPRO_CC}
+PKG_CPP=	${_SUNPRO_CC} -E
+CC=		${PKG_CC:T}
+CPP=		${PKG_CPP:T}
 .  endif
 .  if !empty(_LANGUAGES.sunpro:Mc++)
 _SUNPRO_CXX=	${_SUNPRO_DIR}/bin/CC
 _SUNPRO_LINKS+=	_SUNPRO_CXX
-CXX=		${_SUNPRO_CXX}
+PKG_CXX=	${_SUNPRO_CXX}
+CXX=		${PKG_CXX:T}
 .  endif
 
 _COMPILER_LD_FLAG=	# empty