diff --git a/Makefile.inc1 b/Makefile.inc1
index b241cb348ae4..edaec2306261 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -138,7 +138,9 @@ XMAKEENV=	COMPILER_PATH=${WORLDTMP}/usr/libexec:${WORLDTMP}/usr/bin \
 		PATH=${TMPPATH}
 
 # bootstrap make
-BMAKE=	${BMAKEENV} ${MAKE} DESTDIR=${WORLDTMP} -DNOMAN -DNOINFO
+BMAKE=	${BMAKEENV} ${MAKE} DESTDIR=${WORLDTMP} -DNOMAN -DNOINFO \
+	-DNO_FORTRAN -DNO_GDB -DNO_OBJC
+
 # cross make used for compilation
 XMAKE=	${XMAKEENV} ${MAKE} DESTDIR=${WORLDTMP} \
 		INSTALL="sh ${.CURDIR}/tools/install.sh"
diff --git a/gnu/usr.bin/binutils/Makefile b/gnu/usr.bin/binutils/Makefile
index ad98cbfea2a9..c6a69be427d3 100644
--- a/gnu/usr.bin/binutils/Makefile
+++ b/gnu/usr.bin/binutils/Makefile
@@ -6,10 +6,12 @@ SUBDIR=		libiberty libbfd libopcodes libbinutils \
 		addr2line ar as gasp ld nm objcopy objdump ranlib \
 		size strings strip doc
 
+.if !defined(NO_GDB)
 # Maybe should be unconditional but I don't want to get in the
 # way of the mips port.
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha"
 SUBDIR+=	gdb gdbserver gdbreplay
 .endif
+.endif
 
 .include <bsd.subdir.mk>