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

DIRDEPS_BUILD+PROGS: Fix staging not respecting (BINDIR|PROGNAME)[._]${PROG}.

Browse Source 
Observed in tests/sys/kern.

Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2016-03-09 03:22:20 +00:00
parent f68f6b3dd6
commit 3cf3d03900
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=296555
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
share/mk/bsd.progs.mk
View File

@ -61,11 +61,15 @@ all: ${PROGS}
META_XTRAS+= ${cat ${PROGS:S/$/*.meta_files/} 2>/dev/null || true:L:sh}
.if ${MK_STAGING} != "no"
.if !empty(PROGS)
stage_files.prog: ${PROGS}
.endif
.endif # ${MK_STAGING} != "no"
.if ${MK_STAGING} != "no" && !empty(PROGS)
# Stage from parent while respecting PROGNAME and BINDIR overrides.
.for _prog in ${PROGS}
STAGE_DIR.prog.${_prog}= ${STAGE_OBJTOP}${BINDIR.${_prog}:UBINDIR_${_prog}:U${BINDIR}}
STAGE_AS_SETS+= prog.${_prog}
STAGE_AS_prog.${_prog}= ${PROGNAME.${_prog}:UPROGNAME_${_prog}:U${_prog}}
stage_as.prog.${_prog}: ${_prog}
.endfor
.endif # ${MK_STAGING} != "no" && !empty(PROGS)
.endif
.endif # PROGS || PROGS_CXX

2
share/mk/bsd.sys.mk
View File

@ -208,7 +208,7 @@ staging: beforeinstall
.if ${MK_STAGING_PROG} != "no" && !defined(INTERNALPROG)
STAGE_DIR.prog= ${STAGE_OBJTOP}${BINDIR}
.if !empty(PROG) || !empty(PROGS)
.if !empty(PROG)
.if defined(PROGNAME)
STAGE_AS_SETS+= prog
STAGE_AS_${PROG}= ${PROGNAME}