aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2020-03-31 22:41:48 +0000
committerWarner Losh <imp@FreeBSD.org>2020-03-31 22:41:48 +0000
commitc9870c1542e3371080f3b26ff91f0e8f2ceda68f (patch)
treec3256b9bd508c80c1ea32a756d0702ebe8921580 /Makefile
parenta7783b5a72607a1d02741cbfe50f8516f5a46782 (diff)
downloadsrc-c9870c1542e3371080f3b26ff91f0e8f2ceda68f.tar.gz
src-c9870c1542e3371080f3b26ff91f0e8f2ceda68f.zip
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
Notes
Notes: svn path=/head/; revision=359495
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
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