d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move META MODE's HOST_CC/CXX/CPP setting to local.meta.sys.mk, which

Browse Source 
centralizes the handling of CC and HOST_CC.

This fixes a bug with WITH_CCACHE_BUILD when using MACHINE=host since
CC is overridden in local.init.mk via src.opts.mk long before bsd.compiler.mk
is included.

Originally the ccache implementation was placed in local.init.mk but moved
to bsd.compiler.mk as it seemed more proper and avoided other ordering
issues.

Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2015-11-11 23:52:08 +00:00
parent 96eacdfdc2
commit 00bd6d0f08
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/mk/local.init.mk
View File

@ -29,12 +29,6 @@ CXXFLAGS_LAST+= -I/usr/include
.if ${.MAKE.DEPENDFILE:E} != "host"
UPDATE_DEPENDFILE?= no
.endif
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
CFLAGS+= ${HOST_CFLAGS}
.endif

9
share/mk/local.meta.sys.mk
View File

@ -218,6 +218,15 @@ CPP?= ${HOST_CPP}
.endif
.endif
.if ${MACHINE} == "host"
HOST_CC?= /usr/bin/cc
CC= ${HOST_CC}
HOST_CXX?= /usr/bin/c++
CXX= ${HOST_CXX}
HOST_CPP?= /usr/bin/cpp
CPP= ${HOST_CPP}
.endif
.if ${MACHINE:Nhost:Ncommon} != "" && ${MACHINE} != ${HOST_MACHINE}
# cross-building
.if !defined(FREEBSD_REVISION)