Author: bdrewery
Date: Wed Sep 30 23:14:23 2015
New Revision: 288432
URL: https://svnweb.freebsd.org/changeset/base/288432

Log:
  META_MODE: Set HOST_CXX and HOST_CPP and chain them down into CXX/CPP for 
host builds.
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/share/mk/local.init.mk
  head/share/mk/local.meta.sys.mk

Modified: head/share/mk/local.init.mk
==============================================================================
--- head/share/mk/local.init.mk Wed Sep 30 23:06:29 2015        (r288431)
+++ head/share/mk/local.init.mk Wed Sep 30 23:14:23 2015        (r288432)
@@ -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

Modified: head/share/mk/local.meta.sys.mk
==============================================================================
--- head/share/mk/local.meta.sys.mk     Wed Sep 30 23:06:29 2015        
(r288431)
+++ head/share/mk/local.meta.sys.mk     Wed Sep 30 23:14:23 2015        
(r288432)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to