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

Fix some makeman issues.

Browse Source 
- Don't bother looking up REVISION/BRANCH/etc from release/, or the
  CPUTYPE check, as these are not used for makeman and wastes time.  The also
  invokes auto.obj.mk after I reverted auto.obj.mk ignoring -V in r291312.
- Don't modify CC or PATH when WITH_CCACHE_BUILD or WITH_META_MODE is enabled
  as it leads to bsd.compiler.mk errors.

Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2015-12-08 17:09:17 +00:00
parent d7acdd2f9b
commit 9229b1797a
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.inc1
View File

@ -163,7 +163,7 @@ OSRELDATE= 0
.endif .endif
# Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION. # Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION.
.if !defined(VERSION) .if !defined(VERSION) && !make(showconfig)
REVISION!= ${MAKE} -C ${SRCDIR}/release -V REVISION REVISION!= ${MAKE} -C ${SRCDIR}/release -V REVISION
BRANCH!= ${MAKE} -C ${SRCDIR}/release -V BRANCH BRANCH!= ${MAKE} -C ${SRCDIR}/release -V BRANCH
SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
@ -195,11 +195,14 @@ _TARGET_CPUTYPE=${TARGET_CPUTYPE}
.else .else
_TARGET_CPUTYPE=dummy _TARGET_CPUTYPE=dummy
.endif .endif
# Skip for showconfig as it is just wasted time and may invoke auto.obj.mk.
.if !make(showconfig)
_CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \ _CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \
-f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE -f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE
.if ${_CPUTYPE} != ${_TARGET_CPUTYPE} .if ${_CPUTYPE} != ${_TARGET_CPUTYPE}
.error CPUTYPE global should be set with ?=. .error CPUTYPE global should be set with ?=.
.endif .endif
.endif
.if make(buildworld) .if make(buildworld)
BUILD_ARCH!= uname -p BUILD_ARCH!= uname -p
.if ${MACHINE_ARCH} != ${BUILD_ARCH} .if ${MACHINE_ARCH} != ${BUILD_ARCH}

1
share/mk/bsd.compiler.mk
View File

@ -30,6 +30,7 @@ __<bsd.compiler.mk>__:
# Handle ccache after CC is determined, but not if CC/CXX are already # Handle ccache after CC is determined, but not if CC/CXX are already
# overridden with a manual setup. # overridden with a manual setup.
.if ${MK_CCACHE_BUILD:Uno} == "yes" && \ .if ${MK_CCACHE_BUILD:Uno} == "yes" && \
!make(showconfig) && \
(${CC:M*ccache/world/*} == "" || ${CXX:M*ccache/world/*} == "") (${CC:M*ccache/world/*} == "" || ${CXX:M*ccache/world/*} == "")
# CC is always prepended with the ccache wrapper rather than modifying # CC is always prepended with the ccache wrapper rather than modifying
# PATH since it is more clear that ccache is used and avoids wasting time # PATH since it is more clear that ccache is used and avoids wasting time

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

@ -215,6 +215,7 @@ TOOLSDIR?= ${STAGE_HOST_OBJTOP}
.endif .endif
# Don't use the bootstrap tools logic on itself. # Don't use the bootstrap tools logic on itself.
.if ${.TARGETS:Mbootstrap-tools} == "" && \ .if ${.TARGETS:Mbootstrap-tools} == "" && \
!make(showconfig) && \
!defined(BOOTSTRAPPING_TOOLS) && !empty(TOOLSDIR) && ${.MAKE.LEVEL} == 0 !defined(BOOTSTRAPPING_TOOLS) && !empty(TOOLSDIR) && ${.MAKE.LEVEL} == 0
.for dir in /sbin /bin /usr/sbin /usr/bin .for dir in /sbin /bin /usr/sbin /usr/bin
PATH:= ${TOOLSDIR}${dir}:${PATH} PATH:= ${TOOLSDIR}${dir}:${PATH}