diff options
-rw-r--r-- | Makefile.inc1 | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 5c9c0fd..65beced 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -285,7 +285,7 @@ _worldtmp: .endif .else rm -rf ${WORLDTMP}/legacy/usr/include - # XXX - These two can depend on any header file. +# XXX - These two can depend on any header file. rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif @@ -897,24 +897,20 @@ build-tools: # # cross-tools: Build cross-building tools # -.if (${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386") && \ - ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld .endif - -.if (!defined(NO_RESCUE) || defined(RELEASEDIR)) && \ - ${TARGET_ARCH} != ${MACHINE_ARCH} +.if !defined(NO_RESCUE) || defined(RELEASEDIR) _crunchide= usr.sbin/crunch/crunchide .endif - -.if ${TARGET_ARCH} == "alpha" && ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} == "alpha" _elf2exe= usr.sbin/elf2exe .endif - -.if ${TARGET_ARCH} == "i386" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \ - defined(RELEASEDIR) +.if ${TARGET_ARCH} == "i386" && defined(RELEASEDIR) _kgzip= usr.sbin/kgzip .endif +.endif cross-tools: .for _tool in \ |