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

META_MODE: Follow-up r319593: Don't use host headers in a fresh new build.

Browse Source 
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Bryan Drewery 2017-10-25 21:46:30 +00:00
parent 59696d216c
commit b12371422a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.inc1
View File

@ -671,7 +671,7 @@ META_MODE_BAD_ABI_VERS+= 1200031
OBJDIR_HOST_OSRELDATE!= \ OBJDIR_HOST_OSRELDATE!= \
awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
${OBJTREE}${.CURDIR}/host-osreldate.h ${OBJTREE}${.CURDIR}/host-osreldate.h
.else .elif exists(${WORLDTMP}/usr/include/osreldate.h)
OBJDIR_HOST_OSRELDATE= 0 OBJDIR_HOST_OSRELDATE= 0
.endif .endif
.export OBJDIR_HOST_OSRELDATE .export OBJDIR_HOST_OSRELDATE
@ -680,6 +680,7 @@ OBJDIR_HOST_OSRELDATE= 0
# Note that this logic is the opposite of normal BOOTSTRAP handling. We want # Note that this logic is the opposite of normal BOOTSTRAP handling. We want
# to compare the WORLDTMP's OSRELDATE to the host's OSRELDATE. If the WORLDTMP # to compare the WORLDTMP's OSRELDATE to the host's OSRELDATE. If the WORLDTMP
# is older than the ABI-breakage OSRELDATE of the HOST then we rebuild. # is older than the ABI-breakage OSRELDATE of the HOST then we rebuild.
.if defined(OBJDIR_HOST_OSRELDATE)
.for _ver in ${META_MODE_BAD_ABI_VERS} .for _ver in ${META_MODE_BAD_ABI_VERS}
.if ${OSRELDATE} >= ${_ver} && ${OBJDIR_HOST_OSRELDATE} < ${_ver} .if ${OSRELDATE} >= ${_ver} && ${OBJDIR_HOST_OSRELDATE} < ${_ver}
_meta_mode_need_rebuild= ${_ver} _meta_mode_need_rebuild= ${_ver}
@ -689,8 +690,9 @@ _meta_mode_need_rebuild= ${_ver}
.info META_MODE: Rebuilding host tools due to ABI breakage in __FreeBSD_version ${_meta_mode_need_rebuild}. .info META_MODE: Rebuilding host tools due to ABI breakage in __FreeBSD_version ${_meta_mode_need_rebuild}.
NO_META_IGNORE_HOST_HEADERS= 1 NO_META_IGNORE_HOST_HEADERS= 1
.export NO_META_IGNORE_HOST_HEADERS .export NO_META_IGNORE_HOST_HEADERS
.endif .endif # defined(_meta_mode_need_rebuild)
.endif .endif # defined(OBJDIR_HOST_OSRELDATE)
.endif # ${MK_META_MODE} == "yes" && defined(NO_CLEAN) ...
# This is only used for META_MODE+filemon to track what the oldest # This is only used for META_MODE+filemon to track what the oldest
# __FreeBSD_version is in WORLDTMP. This purposely does NOT have # __FreeBSD_version is in WORLDTMP. This purposely does NOT have
# a make dependency on /usr/include/osreldate.h as the file should # a make dependency on /usr/include/osreldate.h as the file should