From c9870c1542e3371080f3b26ff91f0e8f2ceda68f Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Tue, 31 Mar 2020 22:41:48 +0000 Subject: [PATCH] Fix make kernels to match original commit message make kernels was originally documented (in commit r295099) as the same as make universe -DJUST_BUILD_KERNELS. However, it used the UNIVERSE_TARGET=buildkernel which is subtly different in that it also builds the toolchains and doesn't build the LINT modules unless they happened to already exist in the tree. This unbreaks POLA and just builds the kernels, including LINT, now rather than all that other stuff as well. When the commit originally happened, the two just differed by the LINT bug. r335711 introduced the universe dependency on the toolchain that wasn't present before, which diverged the two further. This restores the original intent of r295099. Reviewed by: brooks, bdrewery, emaste (LGTM) MFC After: 3 days Differential Revision: https://reviews.freebsd.org/D24212 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 06cfabc997d4..99891bc7a39d 100644 --- a/Makefile +++ b/Makefile @@ -479,7 +479,7 @@ kernel-toolchains: .PHONY @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe kernels: .PHONY - @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildkernel universe + @cd ${.CURDIR}; ${SUB_MAKE} universe -DWITHOUT_WORLDS worlds: .PHONY @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildworld universe