On 3 Aug 2021, at 16:22, Bryan Drewery <bdrew...@freebsd.org> wrote:
>
> The branch main has been updated by bdrewery:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=36269b82318280ef184c953b90674f5905e0f53f
>
> commit 36269b82318280ef184c953b90674f5905e0f53f
> Author: Bryan Drewery <bdrew...@freebsd.org>
> AuthorDate: 2021-08-03 15:20:57 +0000
> Commit: Bryan Drewery <bdrew...@freebsd.org>
> CommitDate: 2021-08-03 15:22:14 +0000
>
> Fix native-xtools build
>
> 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(-)
>
> diff --git a/Makefile b/Makefile
> index c64873fb241b..711854f4693c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -218,7 +218,7 @@ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE}
> MK_AUTO_OBJ=no \
> ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
> SRCCONF=${SRCCONF} SRC_ENV_CONF= \
> -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= ${SUBDIR_OVERRIDE}
> NXBMAKEARGS+= \
> OBJTOP=${NXBOBJTOP:Q} \
> OBJROOT=${NXBOBJROOT:Q} \
> - MAKEOBJDIRPREFIX= \
> -DNO_SHARED \
> -DNO_CPU_CFLAGS \
> -DNO_PIC \
> @@ -2763,6 +2762,9 @@ NXBMAKEARGS+= \
> MK_WERROR=no \
> MK_ZFS=no
>
> +NXBMAKEENV+= \
> + MAKEOBJDIRPREFIX=
> +
> .if make(native-xtools*) && \
> (!defined(NXB_TARGET) || !defined(NXB_TARGET_ARCH))
> .error Missing NXB_TARGET / NXB_TARGET_ARCH
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
