Date: Tue, 7 Sep 2021 12:09:37 GMT From: Jessica Clarke <jrtc27@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: b2ea668b8f72 - stable/13 - Fix native-xtools build Message-ID: <202109071209.187C9bfg087149@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=b2ea668b8f7276cc147781a2a67801cf117eecbf commit b2ea668b8f7276cc147781a2a67801cf117eecbf Author: Bryan Drewery <bdrewery@FreeBSD.org> AuthorDate: 2021-08-03 15:20:57 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> CommitDate: 2021-09-07 12:06:46 +0000 Fix native-xtools build Fixes https://github.com/freebsd/poudriere/issues/894 Fixes: d0c737e18 ("Makefile: Fix MAKEOBJDIRPREFIX command-line") X-MFC-With: d0c737e18 (cherry picked from commit b60770fceb2b94efe334221bd13a5e55229babb3) --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 941589324a80..3429d8312d3e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2778,7 +2778,6 @@ SUBDIR= ${SUBDIR_OVERRIDE} NXBMAKEARGS+= \ OBJTOP=${NXBOBJTOP:Q} \ OBJROOT=${NXBOBJROOT:Q} \ - MAKEOBJDIRPREFIX= \ -DNO_SHARED \ -DNO_CPU_CFLAGS \ -DNO_PIC \ @@ -2803,6 +2802,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109071209.187C9bfg087149>