diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2015-09-30 23:14:23 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2015-09-30 23:14:23 +0000 |
commit | 9cef5cac689ef1c242d30a76f30e3d77b8c5f2bb (patch) | |
tree | e56269f0a74e999d1b5adc6d2db8a3c3cb849d42 | |
parent | 6348241c12da94254c6b2797b8b3cedaf6642db1 (diff) | |
download | FreeBSD-src-9cef5cac689ef1c242d30a76f30e3d77b8c5f2bb.zip FreeBSD-src-9cef5cac689ef1c242d30a76f30e3d77b8c5f2bb.tar.gz |
META_MODE: Set HOST_CXX and HOST_CPP and chain them down into CXX/CPP for host builds.
Sponsored by: EMC / Isilon Storage Division
-rw-r--r-- | share/mk/local.init.mk | 8 | ||||
-rw-r--r-- | share/mk/local.meta.sys.mk | 11 |
2 files changed, 13 insertions, 6 deletions
diff --git a/share/mk/local.init.mk b/share/mk/local.init.mk index cf95063..5d71d1f 100644 --- 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 8095bea..adc884b 100644 --- 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 |