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

Fix bsd.subdir.mk-related issues after 0a0f748641

Browse Source 
Since bsd.prog.mk includes bsd.obj.mk, and thus bsd.subdir.mk, we must
ensure all our bsd.subdir.mk-affecting variables are set before
including bsd.prog.mk. Since sbin's various Makefile.arch files add to
SUBDIR this results in those not taking effect, and presumably we also
end up not having buildworld as parallel as it should be due to the fact
that SUBDIR_PARALLEL was not being set before including bsd.prog.mk.

MFC with:	0a0f748641
Reviewed by:	olivier
Differential Revision:	https://reviews.freebsd.org/D31125
This commit is contained in:
Jessica Clarke 2021-07-12 20:54:01 +01:00
parent 6da773cb1c
commit 8b487b8292
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/Makefile
View File

@ -90,14 +90,14 @@ SUBDIR.${MK_ZFS}+= zfsbootcfg
SUBDIR.${MK_TESTS}+= tests
.include <bsd.arch.inc.mk>
SUBDIR_PARALLEL=
# Add architecture-specific manpages
# to be included anyway
MAN= sconfig/sconfig.8
.include <bsd.prog.mk>
.include <bsd.arch.inc.mk>
SUBDIR_PARALLEL=
.include <bsd.subdir.mk>

4
usr.sbin/Makefile
View File

@ -213,6 +213,8 @@ SUBDIR.${MK_TESTS}+= tests
.include <bsd.arch.inc.mk>
SUBDIR_PARALLEL=
# Add architecture-specific manpages
# to be included anyway
MAN= apmd/apmd.8 \
@ -220,6 +222,4 @@ MAN= apmd/apmd.8 \
.include <bsd.prog.mk>
SUBDIR_PARALLEL=
.include <bsd.subdir.mk>