Re: git: 0bebad8d072b - main - bsd.own.mk: Deorbit compat include of bsd.compiler.mk

On 3/15/26 11:48, Mateusz Piotrowski wrote:
> The branch main has been updated by 0mp:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=0bebad8d072bb7abef1cea0d8c8d04d500913adf
> 
> commit 0bebad8d072bb7abef1cea0d8c8d04d500913adf
> Author:     Mateusz Piotrowski <0mp@FreeBSD.org>
> AuthorDate: 2026-03-15 18:35:50 +0000
> Commit:     Mateusz Piotrowski <0mp@FreeBSD.org>
> 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 have broken the CI builds. For example, from amd64's:

https://ci.freebsd.org/job/FreeBSD-main-amd64-build/34829/consoleText

there is:

. . .
 > git checkout -f 0bebad8d072bb7abef1cea0d8c8d04d500913adf # timeout=10
Commit message: "bsd.own.mk: Deorbit compat include of bsd.compiler.mk"
. . .
make[7]: /usr/src/lib/libc/tests/gen/Makefile:10: Variable
"COMPILER_FEATURES" is undefined
	while evaluating variable "COMPILER_FEATURES" with value ""
	in make[7] in directory "/usr/src/lib/libc/tests/gen"
make[7]: /usr/src/lib/libc/tests/gen/Makefile:19: Variable
"COMPILER_FEATURES" is undefined
	while evaluating variable "COMPILER_FEATURES" with value ""
	in make[7] in directory "/usr/src/lib/libc/tests/gen"
make[7]: /usr/src/lib/libc/tests/gen/Makefile:29: Variable
"COMPILER_FEATURES" is undefined
	while evaluating variable "COMPILER_FEATURES" with value ""
	in make[7] in directory "/usr/src/lib/libc/tests/gen"
make[7]: /usr/src/lib/libc/tests/gen/Makefile:111: Variable
"COMPILER_FEATURES" is undefined
	while evaluating variable "COMPILER_FEATURES" with value ""
	in make[7] in directory "/usr/src/lib/libc/tests/gen"
. . .
--- cleandir_subdir_lib/libc/tests/gen ---
make[7]: Fatal errors encountered -- cannot continue
make[7]: stopped making "cleandir" in /usr/src/lib/libc/tests/gen
--- cleandir_subdir_lib/libdiff ---
. . .

The prior:

https://ci.freebsd.org/job/FreeBSD-main-amd64-build/34828/consoleText

with

. . .
 > git checkout -f 356415aaaa8caa18a76ea74eed5c7de6e4d3b5fd # timeout=10
Commit message: "Unbreak LINT after ZFS import"
 > git rev-list --no-walk 462a1f6197fa3de63e0eca2835b1d5b0bc6a3bbb #
timeout=10
. . .

built just fine. Those are back-to-back commits.


-- 
===
Mark Millard
marklmi at yahoo.com