git: 73f37a69f65e - main - Revert "bsd.own.mk: Deorbit compat include of bsd.compiler.mk"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 15 Mar 2026 19:46:51 UTC
The branch main has been updated by 0mp:
URL: https://cgit.FreeBSD.org/src/commit/?id=73f37a69f65ef4a6243a1b80bd763271560fa677
commit 73f37a69f65ef4a6243a1b80bd763271560fa677
Author: Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2026-03-15 19:31:52 +0000
Commit: Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2026-03-15 19:45:29 +0000
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
---
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 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>__)