Date: Thu, 30 Jan 2025 17:19:27 -0800 From: "Simon J. Gerraty" <sjg@juniper.net> To: Cy Schubert <Cy.Schubert@cschubert.com> Cc: <src-committers@FreeBSD.org>, <dev-commits-src-all@FreeBSD.org>, <dev-commits-src-main@FreeBSD.org>, <sjg@juniper.net> Subject: Re: git: 6a7405f5a6b6 - main - Merge bmake-20250125 Message-ID: <8064.1738286367@kaos.jnpr.net> In-Reply-To: <20250131003149.50234D1@slippy.cwsent.com> References: <202501302355.50UNtHPf022794@gitrepo.freebsd.org> <20250131003149.50234D1@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Cy Schubert <Cy.Schubert@cschubert.com> wrote:
> > ++.if ${USE_FILEMON} = = "dev"
>
> make[4]: "/opt/src/git-src/usr.bin/bmake/Makefile" line 177: Malformed
> conditional (make(test) && ${MK_AUTO_OBJ} = = "yes")
>
> This must be a typo.
The result of an ill considered sed command.
I fixed contib/bmake/Makefile a while back to be consistent in its
style, but that made it incompatible with FreeBSD's style, so I "fixed"
it after the merge, thinking I'd tweak after-import.mk for next time.
That made the diff just as big though, so I undid that change
and in doing so screwed it up royally.
Fixed now, sorry for the hiccup.
--sjg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8064.1738286367>