diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2016-02-26 22:13:52 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2016-02-26 22:13:52 +0000 |
commit | 2a524ccba70307ad1a4af4718e2aa82bf07ca32b (patch) | |
tree | beb733abb4f77c5de8be077184eb43a68ca9be13 | |
parent | d0f17612a7bf73b130345d8d88beb2a4bdc326c8 (diff) | |
download | FreeBSD-src-2a524ccba70307ad1a4af4718e2aa82bf07ca32b.zip FreeBSD-src-2a524ccba70307ad1a4af4718e2aa82bf07ca32b.tar.gz |
Move PROGS logic to proper place and remove redundant and unneeded logic.
- bsd.progs.mk is safe to include regardless of PROGS/PROGS_CXX/SCRIPTS
being set.
- bsd.progs.mk includes bsd.prog.mk always and will bring in
bsd.files.mk and bsd.obj.mk.
- DIRDEPS_BUILD: There's no need for _SKIP_BUILD or _SKIP_STAGING as the
PROGS were implicitly being built by the staging dependency anyway. This
was also preventing other objects from building if they were not part of
the staging sets.
- DIRDEPS_BUILD: This fixes PROGS without bsd.test.mk not staging.
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
-rw-r--r-- | share/mk/bsd.progs.mk | 8 | ||||
-rw-r--r-- | share/mk/bsd.test.mk | 26 |
2 files changed, 8 insertions, 26 deletions
diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk index 8c09fc7..7560e7f 100644 --- a/share/mk/bsd.progs.mk +++ b/share/mk/bsd.progs.mk @@ -59,11 +59,19 @@ all: ${PROGS} # We cannot capture dependencies for meta mode here UPDATE_DEPENDFILE = NO + +.if ${MK_STAGING} != "no" +.if !empty(PROGS) +stage_files.prog: ${PROGS} +.endif +.endif # ${MK_STAGING} != "no" .endif .endif # PROGS || PROGS_CXX # These are handled by the main make process. .ifdef _RECURSING_PROGS +MK_STAGING= no + _PROGS_GLOBAL_VARS= CLEANFILES CLEANDIRS CONFGROUPS FILESGROUPS INCSGROUPS \ SCRIPTS .for v in ${_PROGS_GLOBAL_VARS} diff --git a/share/mk/bsd.test.mk b/share/mk/bsd.test.mk index 79018a4..104b980 100644 --- a/share/mk/bsd.test.mk +++ b/share/mk/bsd.test.mk @@ -93,30 +93,4 @@ beforecheck realcheck aftercheck check: .PHONY .ORDER: beforecheck realcheck aftercheck check: beforecheck realcheck aftercheck -.ifdef PROG -# we came here via bsd.progs.mk below -# parent will do staging. -MK_STAGING= no -.endif - -.if !empty(PROGS) || !empty(PROGS_CXX) || !empty(SCRIPTS) .include <bsd.progs.mk> -.endif -.include <bsd.files.mk> - -.if !defined(PROG) && ${MK_STAGING} != "no" -.if !defined(_SKIP_BUILD) -# this will handle staging if needed -_SKIP_STAGING= no -# but we don't want it to build anything -_SKIP_BUILD= -.endif -.if !empty(PROGS) -stage_files.prog: ${PROGS} -.endif -.include <bsd.prog.mk> -.endif - -.if !target(objwarn) -.include <bsd.obj.mk> -.endif |