diff options
| author | Mateusz Piotrowski <0mp@FreeBSD.org> | 2026-03-15 19:31:52 +0000 |
|---|---|---|
| committer | Mateusz Piotrowski <0mp@FreeBSD.org> | 2026-03-15 19:45:29 +0000 |
| commit | 73f37a69f65ef4a6243a1b80bd763271560fa677 (patch) | |
| tree | 88c2946df690dda4f8b82062bb6d4178d912673c | |
| parent | 424d3ca81f4e748afd90332fd6c37c944eb3b3cf (diff) | |
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 <bsd.compiler.mk>" 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
| -rw-r--r-- | share/mk/bsd.own.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 01d41ae5ae6d..4dffe9723a9e 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 <bsd.compiler.mk> +.endif # !_WITHOUT_SRCCONF + .endif # !target(__<bsd.own.mk>__) |