diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2016-03-12 18:57:34 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2016-03-12 18:57:34 +0000 |
commit | 2f1fc2d5b38b526af286c048c8e26a416789a52a (patch) | |
tree | 1232cc2cfcaf8cdbec335b8168629f822a9ec51c | |
parent | e3064c82179f47f3fab679c9c63d247c6c64a248 (diff) | |
download | FreeBSD-src-2f1fc2d5b38b526af286c048c8e26a416789a52a.zip FreeBSD-src-2f1fc2d5b38b526af286c048c8e26a416789a52a.tar.gz |
MFC r295994,r296000:
r295994:
PROGS: Remove the 'build one' optimization since it breaks 'build multiple'
r296000:
PROGS: Only the main process will install INCS.
-rw-r--r-- | share/mk/bsd.progs.mk | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk index ed34c7b..8cb20c9 100644 --- a/share/mk/bsd.progs.mk +++ b/share/mk/bsd.progs.mk @@ -31,18 +31,6 @@ UPDATE_DEPENDFILE_PROG = ${PROGS:[1]} UPDATE_DEPENDFILE_PROG?= no .endif -.ifndef PROG -# They may have asked us to build just one -.for t in ${PROGS} -.if make($t) -.if ${PROGS_CXX:U:M${t}} -PROG_CXX ?= $t -.endif -PROG ?= $t -.endif -.endfor -.endif - .if defined(PROG) # just one of many PROG_OVERRIDE_VARS += BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_WERROR \ @@ -82,7 +70,7 @@ UPDATE_DEPENDFILE = NO # These are handled by the main make process. .ifdef _RECURSING_PROGS -_PROGS_GLOBAL_VARS= CLEANFILES CLEANDIRS FILESGROUPS SCRIPTS +_PROGS_GLOBAL_VARS= CLEANFILES CLEANDIRS FILESGROUPS INCSGROUPS SCRIPTS .for v in ${_PROGS_GLOBAL_VARS} $v = .endfor |