Author: bdrewery
Date: Wed Mar 9 03:22:20 2016
New Revision: 296555
URL: https://svnweb.freebsd.org/changeset/base/296555
Log:
DIRDEPS_BUILD+PROGS: Fix staging not respecting (BINDIR|PROGNAME)[._]${PROG}.
Observed in tests/sys/kern.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/bsd.progs.mk
head/share/mk/bsd.sys.mk
Modified: head/share/mk/bsd.progs.mk
==============================================================================
--- head/share/mk/bsd.progs.mk Wed Mar 9 03:22:17 2016 (r296554)
+++ head/share/mk/bsd.progs.mk Wed Mar 9 03:22:20 2016 (r296555)
@@ -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
Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk Wed Mar 9 03:22:17 2016 (r296554)
+++ head/share/mk/bsd.sys.mk Wed Mar 9 03:22:20 2016 (r296555)
@@ -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}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
