git: 8b487b8292e4 - main - Fix bsd.subdir.mk-related issues after 0a0f7486413c
Jessica Clarke
jrtc27 at FreeBSD.org
Mon Jul 12 19:55:20 UTC 2021
The branch main has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=8b487b8292e4ab0b18998055b64235c4cc3ab771
commit 8b487b8292e4ab0b18998055b64235c4cc3ab771
Author: Jessica Clarke <jrtc27 at FreeBSD.org>
AuthorDate: 2021-07-12 19:54:01 +0000
Commit: Jessica Clarke <jrtc27 at FreeBSD.org>
CommitDate: 2021-07-12 19:54:01 +0000
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 <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>
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 <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>
More information about the dev-commits-src-all
mailing list