diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 796cefcacc98..4fff36a48725 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -16,7 +16,7 @@ SUBDIR+= libssp
 SUBDIR+= tests
 .endif
 
-.if ${MK_GDB} != "no"
+.if ${MK_BINUTILS} != "no" && ${MK_GDB} != "no"
 SUBDIR+=	libreadline
 .endif
 
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 470b61220fa9..518000d65da7 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -16,6 +16,8 @@ SUBDIR= ${_binutils} \
 	sdiff \
 	${_tests}
 
+SUBDIR_DEPEND_gdb= ${_binutils}
+
 .if ${MK_CXX} != "no"
 .if ${MK_GCC} != "no"
 _gperf=		gperf
@@ -39,13 +41,14 @@ _tests=		tests
 
 .if ${MK_BINUTILS} != "no"
 _binutils=	binutils
-.endif
-.if ${MK_GCC} != "no"
-_cc=		cc
-.endif
 .if ${MK_GDB} != "no"
 _gdb=		gdb
 .endif
+.endif
+
+.if ${MK_GCC} != "no"
+_cc=		cc
+.endif
 
 SUBDIR_PARALLEL=