Index: head/gnu/lib/Makefile
===================================================================
--- head/gnu/lib/Makefile	(revision 285683)
+++ head/gnu/lib/Makefile	(revision 285684)
@@ -1,29 +1,29 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 SUBDIR= csu libgcc libdialog libregex
 
 .if ${MK_GCC} != "no"
 SUBDIR+= libgcov libgomp
 .endif
 
 .if ${MK_SSP} != "no"
 SUBDIR+= libssp
 .endif
 
 .if ${MK_TESTS} != "no"
 SUBDIR+= tests
 .endif
 
-.if ${MK_GDB} != "no"
+.if ${MK_BINUTILS} != "no" && ${MK_GDB} != "no"
 SUBDIR+=	libreadline
 .endif
 
 # libsupc++ uses libstdc++ headers, although 'make includes' should
 # have taken care of that already.
 .if ${MK_GNUCXX} != "no"
 SUBDIR+= libstdc++ libsupc++
 .endif
 
 .include <bsd.subdir.mk>
Index: head/gnu/usr.bin/Makefile
===================================================================
--- head/gnu/usr.bin/Makefile	(revision 285683)
+++ head/gnu/usr.bin/Makefile	(revision 285684)
@@ -1,52 +1,55 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 SUBDIR= ${_binutils} \
 	${_cc} \
 	dialog \
 	diff \
 	diff3 \
 	${_dtc} \
 	${_gdb} \
 	${_gperf} \
 	grep \
 	${_groff} \
 	${_rcs} \
 	sdiff \
 	${_tests}
 
+SUBDIR_DEPEND_gdb= ${_binutils}
+
 .if ${MK_CXX} != "no"
 .if ${MK_GCC} != "no"
 _gperf=		gperf
 .endif
 .if ${MK_GROFF} != "no"
 _groff=		groff
 .endif
 .endif
 
 .if ${MK_GPL_DTC} != "no"
 _dtc=		dtc
 .endif
 
 .if ${MK_RCS} != "no"
 _rcs=		rcs
 .endif
 
 .if ${MK_TESTS} != "no"
 _tests=		tests
 .endif
 
 .if ${MK_BINUTILS} != "no"
 _binutils=	binutils
+.if ${MK_GDB} != "no"
+_gdb=		gdb
 .endif
+.endif
+
 .if ${MK_GCC} != "no"
 _cc=		cc
-.endif
-.if ${MK_GDB} != "no"
-_gdb=		gdb
 .endif
 
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>