From 8b487b8292e4ab0b18998055b64235c4cc3ab771 Mon Sep 17 00:00:00 2001 From: Jessica Clarke Date: Mon, 12 Jul 2021 20:54:01 +0100 Subject: [PATCH] Fix bsd.subdir.mk-related issues after 0a0f7486413c 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: 0a0f7486413c147d56808b38055c40c64cff61f5 Reviewed by: olivier Differential Revision: https://reviews.freebsd.org/D31125 --- sbin/Makefile | 8 ++++---- usr.sbin/Makefile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sbin/Makefile b/sbin/Makefile index f53e2f037ebe..6d6b647651ad 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -90,14 +90,14 @@ SUBDIR.${MK_ZFS}+= zfsbootcfg SUBDIR.${MK_TESTS}+= tests +.include + +SUBDIR_PARALLEL= + # Add architecture-specific manpages # to be included anyway MAN= sconfig/sconfig.8 .include -.include - -SUBDIR_PARALLEL= - .include diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index a5d2a476538f..f0614ba9b348 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -213,6 +213,8 @@ SUBDIR.${MK_TESTS}+= tests .include +SUBDIR_PARALLEL= + # Add architecture-specific manpages # to be included anyway MAN= apmd/apmd.8 \ @@ -220,6 +222,4 @@ MAN= apmd/apmd.8 \ .include -SUBDIR_PARALLEL= - .include