diff --git a/setup_board b/setup_board
index 0320f3d2fd..8e93cb8f9e 100755
--- a/setup_board
+++ b/setup_board
@@ -175,7 +175,9 @@ toolchain_needs_update() {
         pkgs+=" =cross-$toolchain/linux-headers-$FLAGS_kernel_version"
     fi
   fi
-  pkgs+=" cross-$toolchain/gdb"
+  if [[ "$toolchain" != "arm-none-eabi" ]] ; then
+    pkgs+=" cross-$toolchain/gdb"
+  fi
   ACCEPT_KEYWORDS="~* *" emerge $flags $pkgs | grep cross-$toolchain/
 }