META_MODE: Set HOST_CXX and HOST_CPP and chain them down into CXX/CPP for host builds.

Sponsored by:	EMC / Isilon Storage Division

diff --git a/share/mk/local.init.mk b/share/mk/local.init.mk
index cf95063c952a0faba3cfe2668aa37cc2edcbdfcf..5d71d1fdb7e275d7c41e001b162a7248a436416a 100644 (file)
--- a/share/mk/local.init.mk
+++ b/share/mk/local.init.mk
@@ -28,8 +28,12 @@ CXXFLAGS_LAST+= -I/usr/include
 .if ${.MAKE.DEPENDFILE:E} != "host"
 UPDATE_DEPENDFILE?= no
 .endif
-HOST_CC?= /usr/bin/cc
+HOST_CC?=      /usr/bin/cc
+CC=            ${HOST_CC}
+HOST_CXX?=     /usr/bin/c++
+CXX=           ${HOST_CXX}
+HOST_CPP?=     /usr/bin/cpp
+CPP=           ${HOST_CPP}
 HOST_CFLAGS+= -DHOSTPROG
-CC= ${HOST_CC}
 CFLAGS+= ${HOST_CFLAGS}
 .endif

diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk
index 8095beada1f8318e835838f2255807d5680799f9..adc884bc5d164232611b24a165341c917604a648 100644 (file)
--- a/share/mk/local.meta.sys.mk
+++ b/share/mk/local.meta.sys.mk
@@ -213,10 +213,13 @@ TOOLSDIR?= ${STAGE_HOST_OBJTOP}
 PATH:= ${PATH:S,:, ,g:@d@${exists(${TOOLSDIR}$d):?${TOOLSDIR}$d:}@:ts:}:${PATH}
 .export PATH
 .if exists(${TOOLSDIR}/usr/bin/cc)
-HOST_CC?= ${TOOLSDIR}/usr/bin/cc
-CC?= ${TOOLSDIR}/usr/bin/cc
-CXX?= ${TOOLSDIR}/usr/bin/c++
-.export HOST_CC CC CXX
+HOST_CC?=      ${TOOLSDIR}/usr/bin/cc
+CC?=           ${HOST_CC}
+HOST_CXX?=     ${TOOLSDIR}/usr/bin/c++
+CXX?=          ${HOST_CXX}
+HOST_CPP?=     ${TOOLSDIR}/usr/bin/cpp
+CPP?=          ${HOST_CPP}
+.export HOST_CC CC HOST_CXX CXX HOST_CPP CPP
 .endif
 .endif
 .endif