The branch main has been updated by bdrewery:
URL:
https://cgit.FreeBSD.org/src/commit/?id=b60770fceb2b94efe334221bd13a5e55229babb3
commit b60770fceb2b94efe334221bd13a5e55229babb3
Author: Bryan Drewery <bdrew...@freebsd.org>
AuthorDate: 2021-08-03 15:20:57 +0000
Commit: Bryan Drewery <bdrew...@freebsd.org>
CommitDate: 2021-08-03 17:00:28 +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.inc1 | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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"
