diff --git a/gdbserver_tests/make_local_links b/gdbserver_tests/make_local_links
index f7291d65a..7ed9a73fd 100755
--- a/gdbserver_tests/make_local_links
+++ b/gdbserver_tests/make_local_links
@@ -10,9 +10,9 @@
 # The vgdb link is needed either for gdb tests
 # or for standalone vgdb tests.
 
-ln -f -s $1 gdbserver_tests/gdb
-if [ -x gdbserver_tests/gdb ]
+if [ -x "$1" ]
 then
+   ln -f -s "$1" gdbserver_tests/gdb
    # Try to extract the gdb version.
    VERSIONLINE=`gdbserver_tests/gdb --version | head -1`
    VERSION=`echo $VERSIONLINE                         |