Am Tage des Herren Sun, 15 Mar 2026 18:48:21 +0000 Mateusz Piotrowski <[email protected]> schrieb:
> The branch main has been updated by 0mp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=0bebad8d072bb7abef1cea0d8c8d04d500913adf > > commit 0bebad8d072bb7abef1cea0d8c8d04d500913adf > Author: Mateusz Piotrowski <[email protected]> > AuthorDate: 2026-03-15 18:35:50 +0000 > Commit: Mateusz Piotrowski <[email protected]> > CommitDate: 2026-03-15 18:47:35 +0000 > > bsd.own.mk: Deorbit compat include of bsd.compiler.mk > > Commit b946bedd09d3bd1 ("Previous versions of bsd.own.mk [...]") > mentions that bsd.own.mk included bsd.compiler.mk as a temporary > workaround and was destined to be removed in FreeBSD 12. Do that now. > > PR: 203540 > Reviewed by: bnovkov, imp > Approved by: bnovkov (mentor) > Differential Revision: https://reviews.freebsd.org/D55867 > --- > share/mk/bsd.own.mk | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk > index 4dffe9723a9e..01d41ae5ae6d 100644 > --- a/share/mk/bsd.own.mk > +++ b/share/mk/bsd.own.mk > @@ -291,10 +291,4 @@ 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>__) > This seems to break "buildkernel": [...] make[3]: /usr/src/sys/modules/Makefile:949: Variable "COMPILER_TYPE" is undefined in make[3] in directory "/usr/src/sys/modules" make[3]: Fatal errors encountered -- cannot continue make[3]: stopped making "all" in /usr/src/sys/modules *** Error code 1 Kind regards, oh -- A FreeBSD user
pgpwICYqvizCT.pgp
Description: OpenPGP digital signature
