diff --git a/core/recipes-devtools/gdb/gdb_7.6.2.bbappend b/core/recipes-devtools/gdb/gdb_7.6.2.bbappend
index e2b4ee7..32da30b 100644
--- a/core/recipes-devtools/gdb/gdb_7.6.2.bbappend
+++ b/core/recipes-devtools/gdb/gdb_7.6.2.bbappend
@@ -1,4 +1,5 @@
 # Disable build of gdbserver because it is 
 # provided by external-sourcery-toolchain
-PACKAGES := "${@oe_filter_out('gdbserver', '${PACKAGES}', d)}"
-EXTRA_OECONF += "--disable-gdbserver"
+PACKAGES := "${@oe_filter_out('gdbserver' if '${TCMODE}'.startswith('external-sourcery') else '$', '${PACKAGES}', d)}"
+DISABLE_GDBSERVER := "${@'--disable-gdbserver' if '${TCMODE}'.startswith('external-sourcery') else ''}"
+EXTRA_OECONF += "${DISABLE_GDBSERVER}"