Index: head/gnu/lib/Makefile
===================================================================
--- head/gnu/lib/Makefile	(revision 307678)
+++ head/gnu/lib/Makefile	(revision 307679)
@@ -1,27 +1,31 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 SUBDIR=			csu
 SUBDIR+=		libgcc
-SUBDIR+=		libregex
 
 SUBDIR.${MK_DIALOG}+=	libdialog
 SUBDIR.${MK_GCC}+=	libgcov libgomp
 SUBDIR.${MK_SSP}+=	libssp
 SUBDIR.${MK_TESTS}+=	tests
 
 .if ${MK_BINUTILS} != "no" && ${MK_GDB} != "no"
 SUBDIR+=	libreadline
+.endif
+
+.if ${MK_GNU_DIFF} != "no" || ${MK_GNU_GREP} != "no" || \
+    ${GNU_GREP_COMPAT} != "no" || ${MK_GDB} != "no"
+SUBDIR+=		libregex
 .endif
 
 # libsupc++ uses libstdc++ headers, although 'make includes' should
 # have taken care of that already.
 .if ${MK_GNUCXX} != "no"
 SUBDIR+= libstdc++ libsupc++
 SUBDIR_DEPENDS_libsupc++:= libstdc++
 .endif
 
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>