git: b2ea668b8f72 - stable/13 - Fix native-xtools build
Jessica Clarke
jrtc27 at FreeBSD.org
Tue Sep 7 12:09:38 UTC 2021
The branch stable/13 has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=b2ea668b8f7276cc147781a2a67801cf117eecbf
commit b2ea668b8f7276cc147781a2a67801cf117eecbf
Author: Bryan Drewery <bdrewery at FreeBSD.org>
AuthorDate: 2021-08-03 15:20:57 +0000
Commit: Jessica Clarke <jrtc27 at 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
More information about the dev-commits-src-all
mailing list