Date: Tue, 3 Aug 2021 16:26:19 +0100 From: Jessica Clarke <jrtc27@freebsd.org> To: Bryan Drewery <bdrewery@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: 36269b823182 - main - Fix native-xtools build Message-ID: <21EA81CD-0058-4E80-9FAD-424C0ACCD276@freebsd.org> In-Reply-To: <202108031522.173FMHF9030395@gitrepo.freebsd.org> References: <202108031522.173FMHF9030395@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 3 Aug 2021, at 16:22, Bryan Drewery <bdrewery@FreeBSD.org> wrote: >=20 > The branch main has been updated by bdrewery: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D36269b82318280ef184c953b90674f59= 05e0f53f >=20 > commit 36269b82318280ef184c953b90674f5905e0f53f > Author: Bryan Drewery <bdrewery@FreeBSD.org> > AuthorDate: 2021-08-03 15:20:57 +0000 > Commit: Bryan Drewery <bdrewery@FreeBSD.org> > CommitDate: 2021-08-03 15:22:14 +0000 >=20 > Fix native-xtools build >=20 > Fixes https://github.com/freebsd/poudriere/issues/894 > Fixes: d0c737e18 ("Makefile: Fix MAKEOBJDIRPREFIX = command-line") > X-MFC-With: d0c737e18 > --- > Makefile | 2 +- > Makefile.inc1 | 4 +++- > 2 files changed, 4 insertions(+), 2 deletions(-) >=20 > diff --git a/Makefile b/Makefile > index c64873fb241b..711854f4693c 100644 > --- a/Makefile > +++ b/Makefile > @@ -218,7 +218,7 @@ _MAKEOBJDIRPREFIX!=3D /usr/bin/env -i PATH=3D${PATH}= ${MAKE} MK_AUTO_OBJ=3Dno \ > ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=3D*} __MAKE_CONF=3D${__MAKE_CONF} \ > SRCCONF=3D${SRCCONF} SRC_ENV_CONF=3D \ > -f /dev/null -V MAKEOBJDIRPREFIX dummy > -.if !empty(_MAKEOBJDIRPREFIX) || = !empty(.MAKEOVERRIDES:MMAKEOBJDIRPREFIX) > +.if !empty(_MAKEOBJDIRPREFIX) Why was this reverted? This restores the bug I was fixing. Does your change below not fix the actual issue you were seeing? Jess > .error MAKEOBJDIRPREFIX can only be set in environment or = src-env.conf(5),\ > not as a global (in make.conf(5) or src.conf(5)) or command-line = variable. > .endif > diff --git a/Makefile.inc1 b/Makefile.inc1 > index e3707c7a504a..b6843177c10b 100644 > --- a/Makefile.inc1 > +++ b/Makefile.inc1 > @@ -2739,7 +2739,6 @@ SUBDIR=3D ${SUBDIR_OVERRIDE} > NXBMAKEARGS+=3D \ > OBJTOP=3D${NXBOBJTOP:Q} \ > OBJROOT=3D${NXBOBJROOT:Q} \ > - MAKEOBJDIRPREFIX=3D \ > -DNO_SHARED \ > -DNO_CPU_CFLAGS \ > -DNO_PIC \ > @@ -2763,6 +2762,9 @@ NXBMAKEARGS+=3D \ > MK_WERROR=3Dno \ > MK_ZFS=3Dno >=20 > +NXBMAKEENV+=3D \ > + MAKEOBJDIRPREFIX=3D > + > .if make(native-xtools*) && \ > (!defined(NXB_TARGET) || !defined(NXB_TARGET_ARCH)) > .error Missing NXB_TARGET / NXB_TARGET_ARCH
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?21EA81CD-0058-4E80-9FAD-424C0ACCD276>