diff --git a/toolchain/glibc/Config.version b/toolchain/glibc/Config.version
index 0d84df2175..2ac01d7d73 100644
--- a/toolchain/glibc/Config.version
+++ b/toolchain/glibc/Config.version
@@ -10,7 +10,6 @@ config EGLIBC_VERSION_2_19
 	bool
 
 config GLIBC_VERSION_2_21
-	default y if !TOOLCHAINOPTS
 	bool
 
 config GLIBC_REVISION
@@ -20,3 +19,8 @@ config GLIBC_REVISION
 	default ""
 
 endif
+
+menu "eglibc configuration"
+	depends on !TOOLCHAINOPTS && USE_GLIBC
+	source toolchain/glibc/config/Config.in
+endmenu