From 73f37a69f65ef4a6243a1b80bd763271560fa677 Mon Sep 17 00:00:00 2001 From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Sun, 15 Mar 2026 20:31:52 +0100 Subject: [PATCH] Revert "bsd.own.mk: Deorbit compat include of bsd.compiler.mk" This reverts commit 0bebad8d072bb7abef1cea0d8c8d04d500913adf. It might be that all that's needed to fix this is to add ".include " to some Makefiles. I'll look into it soon but for now let's unbreak HEAD. Approved by: bnovkov (mentor) Differential Revision: https://reviews.freebsd.org/D55869 --- share/mk/bsd.own.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 01d41ae5ae6..4dffe9723a9 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -291,4 +291,10 @@ TESTSBASE?= /usr/tests DEPENDFILE?= .depend +# Compat for the moment -- old bsd.own.mk only included this when _WITHOUT_SRCCONF +# wasn't defined. bsd.ports.mk and friends depend on this behavior. Remove in 12. +.if !defined(_WITHOUT_SRCCONF) +.include +.endif # !_WITHOUT_SRCCONF + .endif # !target(____)