diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e1c2bfa95ca..6331e520eae 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-01  Tom de Vries  <tdevries@suse.de>
+
+	* boards/cc-with-tweaks.exp: Generate gdb.sh, and pass it in env(GDB).
+
 2019-05-01  Tom de Vries  <tdevries@suse.de>
 
 	* boards/dwarf4-gdb-index.exp: Use cc-with-tweaks.exp.
diff --git a/gdb/testsuite/boards/cc-with-tweaks.exp b/gdb/testsuite/boards/cc-with-tweaks.exp
index 11ec6a2850c..c50a0065c28 100644
--- a/gdb/testsuite/boards/cc-with-tweaks.exp
+++ b/gdb/testsuite/boards/cc-with-tweaks.exp
@@ -53,3 +53,8 @@ if ![info exists CXX_FOR_TARGET] {
     set CXX_FOR_TARGET "$found_gxx"
 }
 set CXX_FOR_TARGET "$contrib_dir/cc-with-tweaks.sh $CC_WITH_TWEAKS_FLAGS $CXX_FOR_TARGET"
+
+set pwd [exec pwd -P]
+exec echo $GDB $INTERNAL_GDBFLAGS $GDBFLAGS \"\$@\" > $pwd/gdb.sh
+exec chmod +x gdb.sh
+set env(GDB) $pwd/gdb.sh