Revert "Fix native-xtools build"
This reverts commit 36269b8231
.
This had an unintended change included.
This commit is contained in:
parent
0fa5403d49
commit
2482ea42fb
2
Makefile
2
Makefile
@ -218,7 +218,7 @@ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} MK_AUTO_OBJ=no \
|
|||||||
${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
|
${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
|
||||||
SRCCONF=${SRCCONF} SRC_ENV_CONF= \
|
SRCCONF=${SRCCONF} SRC_ENV_CONF= \
|
||||||
-f /dev/null -V MAKEOBJDIRPREFIX dummy
|
-f /dev/null -V MAKEOBJDIRPREFIX dummy
|
||||||
.if !empty(_MAKEOBJDIRPREFIX)
|
.if !empty(_MAKEOBJDIRPREFIX) || !empty(.MAKEOVERRIDES:MMAKEOBJDIRPREFIX)
|
||||||
.error MAKEOBJDIRPREFIX can only be set in environment or src-env.conf(5),\
|
.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.
|
not as a global (in make.conf(5) or src.conf(5)) or command-line variable.
|
||||||
.endif
|
.endif
|
||||||
|
@ -2739,6 +2739,7 @@ SUBDIR= ${SUBDIR_OVERRIDE}
|
|||||||
NXBMAKEARGS+= \
|
NXBMAKEARGS+= \
|
||||||
OBJTOP=${NXBOBJTOP:Q} \
|
OBJTOP=${NXBOBJTOP:Q} \
|
||||||
OBJROOT=${NXBOBJROOT:Q} \
|
OBJROOT=${NXBOBJROOT:Q} \
|
||||||
|
MAKEOBJDIRPREFIX= \
|
||||||
-DNO_SHARED \
|
-DNO_SHARED \
|
||||||
-DNO_CPU_CFLAGS \
|
-DNO_CPU_CFLAGS \
|
||||||
-DNO_PIC \
|
-DNO_PIC \
|
||||||
@ -2762,9 +2763,6 @@ NXBMAKEARGS+= \
|
|||||||
MK_WERROR=no \
|
MK_WERROR=no \
|
||||||
MK_ZFS=no
|
MK_ZFS=no
|
||||||
|
|
||||||
NXBMAKEENV+= \
|
|
||||||
MAKEOBJDIRPREFIX=
|
|
||||||
|
|
||||||
.if make(native-xtools*) && \
|
.if make(native-xtools*) && \
|
||||||
(!defined(NXB_TARGET) || !defined(NXB_TARGET_ARCH))
|
(!defined(NXB_TARGET) || !defined(NXB_TARGET_ARCH))
|
||||||
.error Missing NXB_TARGET / NXB_TARGET_ARCH
|
.error Missing NXB_TARGET / NXB_TARGET_ARCH
|
||||||
|
Loading…
Reference in New Issue
Block a user