We want to use stage_includes as a hook, so use NO_STAGE_INCLUDES
in include/Makefile to suppress normal behavior
This commit is contained in:
parent
a5e980ce95
commit
1a682d2cea
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/projects/bmake/; revision=266224
@ -121,7 +121,7 @@ _MARCHS+= x86
|
|||||||
|
|
||||||
.if ${MK_STAGING} != "no"
|
.if ${MK_STAGING} != "no"
|
||||||
# tell bsd.incs.mk that we have it covered
|
# tell bsd.incs.mk that we have it covered
|
||||||
stage_includes:
|
NO_STAGE_INCLUDES=
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
@ -371,3 +371,12 @@ symlinks:
|
|||||||
.if ${MK_META_MODE} == "yes"
|
.if ${MK_META_MODE} == "yes"
|
||||||
touch ${.TARGET}
|
touch ${.TARGET}
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
.if ${MACHINE} == "host"
|
||||||
|
# we're here because we are building a sysroot...
|
||||||
|
# we need MACHINE et al set correctly
|
||||||
|
HOST_MACHINE!= uname -m
|
||||||
|
HOST_MACHINE_ARCH!= uname -p
|
||||||
|
MACHINE:= ${HOST_MACHINE}
|
||||||
|
MACHINE_ARCH:= ${HOST_MACHINE_ARCH}
|
||||||
|
.endif
|
||||||
|
@ -45,6 +45,7 @@ ${group}NAME_${header:T}?= ${header:T}
|
|||||||
STAGE_AS_SETS+= ${group}
|
STAGE_AS_SETS+= ${group}
|
||||||
STAGE_AS_${header:T}= ${${group}NAME_${header:T}}
|
STAGE_AS_${header:T}= ${${group}NAME_${header:T}}
|
||||||
stage_as.${group}: ${header}
|
stage_as.${group}: ${header}
|
||||||
|
stage_includes: stage_as.${group}
|
||||||
|
|
||||||
installincludes: _${group}INS_${header:T}
|
installincludes: _${group}INS_${header:T}
|
||||||
_${group}INS_${header:T}: ${header}
|
_${group}INS_${header:T}: ${header}
|
||||||
@ -58,6 +59,7 @@ _${group}INCS+= ${header}
|
|||||||
.endfor
|
.endfor
|
||||||
.if !empty(_${group}INCS)
|
.if !empty(_${group}INCS)
|
||||||
stage_files.${group}: ${_${group}INCS}
|
stage_files.${group}: ${_${group}INCS}
|
||||||
|
stage_includes: stage_files.${group}
|
||||||
|
|
||||||
installincludes: _${group}INS
|
installincludes: _${group}INS
|
||||||
_${group}INS: ${_${group}INCS}
|
_${group}INS: ${_${group}INCS}
|
||||||
@ -91,13 +93,8 @@ realinstall: installincludes
|
|||||||
.ORDER: beforeinstall installincludes
|
.ORDER: beforeinstall installincludes
|
||||||
|
|
||||||
.if ${MK_STAGING} != "no" && !defined(_SKIP_BUILD)
|
.if ${MK_STAGING} != "no" && !defined(_SKIP_BUILD)
|
||||||
.if !target(stage_includes)
|
.if !defined(NO_STAGE_INCLUDES)
|
||||||
.if !empty(STAGE_SETS)
|
staging: stage_includes
|
||||||
buildincludes: stage_files
|
|
||||||
.if !empty(STAGE_AS_SETS)
|
|
||||||
buildincludes: stage_as
|
|
||||||
.endif
|
|
||||||
.endif
|
|
||||||
.if !empty(INCSLINKS)
|
.if !empty(INCSLINKS)
|
||||||
staging: stage_symlinks
|
staging: stage_symlinks
|
||||||
STAGE_SYMLINKS.INCS= ${INCSLINKS}
|
STAGE_SYMLINKS.INCS= ${INCSLINKS}
|
||||||
|
@ -123,6 +123,7 @@ _STAGE_BASENAME_USE: .USE ${.TARGET:T}
|
|||||||
STAGE_TARGETS += stage_incs
|
STAGE_TARGETS += stage_incs
|
||||||
STAGE_INCS ?= ${.ALLSRC:N.dirdep}
|
STAGE_INCS ?= ${.ALLSRC:N.dirdep}
|
||||||
|
|
||||||
|
stage_includes: stage_incs
|
||||||
stage_incs: .dirdep
|
stage_incs: .dirdep
|
||||||
@${STAGE_FILE_SCRIPT}; StageFiles ${STAGE_INCSDIR:${STAGE_DIR_FILTER}} ${STAGE_INCS}
|
@${STAGE_FILE_SCRIPT}; StageFiles ${STAGE_INCSDIR:${STAGE_DIR_FILTER}} ${STAGE_INCS}
|
||||||
@touch $@
|
@touch $@
|
||||||
@ -220,7 +221,7 @@ stage_as.$s: .dirdep
|
|||||||
.endfor
|
.endfor
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
CLEANFILES += ${STAGE_TARGETS}
|
CLEANFILES += ${STAGE_TARGETS} stage_incs stage_includes
|
||||||
|
|
||||||
# stage_*links usually needs to follow any others.
|
# stage_*links usually needs to follow any others.
|
||||||
.for t in ${STAGE_TARGETS:N*links:O:u}
|
.for t in ${STAGE_TARGETS:N*links:O:u}
|
||||||
|
Loading…
Reference in New Issue
Block a user