diff --git a/config/debug/gdb.in.cross b/config/debug/gdb.in.cross
index c731bf61..b5d362cc 100644
--- a/config/debug/gdb.in.cross
+++ b/config/debug/gdb.in.cross
@@ -1,5 +1,8 @@
 # Menu for the cross GDB
 
+config STATIC_TOOLCHAIN
+    select GDB_CROSS_STATIC if GDB_CROSS
+
 config GDB_CROSS
     bool
     prompt "Cross-gdb"
diff --git a/config/toolchain.in b/config/toolchain.in
index 12e2b73e..86578c6b 100644
--- a/config/toolchain.in
+++ b/config/toolchain.in
@@ -40,6 +40,9 @@ config STATIC_TOOLCHAIN
       confident that this host has the required versions of system libs, then
       you can say 'Y' here, and all the host tools will be linked staticaly.
       
+      The impacted tools are:
+        - the cross-gdb
+      
       The default is 'N', to build dynamicaly-linked host binaries.
       
       NOTE: this has no connection to whether the target libraries will be