diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 1676b4752022..cdad1f2afac1 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -1,7 +1,10 @@
 # $FreeBSD$
 
-SUBDIR= libdialog libgcc libgcc_r libgmp libmp libobjc libregex libreadline \
-	libstdc++
+SUBDIR= libdialog libgcc libgcc_r libgmp libmp libregex libreadline libstdc++
+
+.if !defined(NO_OBJC)
+SUBDIR+= libobjc
+.endif
 
 .if !defined(NO_FORTRAN)
 SUBDIR+= libg2c
diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index 4157c8bad0d4..319603522846 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -5,10 +5,12 @@
 
 SUBDIR= cc_tools cc_int cc_drv cpp cc1 cc cc1obj cc1plus c++ c++filt doc
 
+.if !defined(NO_OBJC)
+SUBDIR+= cc1obj
+.endif
+
 .if !defined(NO_FORTRAN)
-SUBDIR+= f77
-SUBDIR+= f771
-SUBDIR+= f77doc
+SUBDIR+= f77 f771 f77doc
 .endif
 
 .include <bsd.subdir.mk>