[binutils-gdb] Add Ada support to cc-with-tweaks.exp

[binutils-gdb] Add Ada support to cc-with-tweaks.exp

[Tom Tromey]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=8a51616424828e6204a20436a719f98436f5d5ea

commit 8a51616424828e6204a20436a719f98436f5d5ea
Author: Tom Tromey <tromey@adacore.com>
Date:   Tue Jul 9 13:51:26 2019 -0600

    Add Ada support to cc-with-tweaks.exp
    
    This adds Ada support to the cc-with-tweaks.exp board file, so that we
    can test Ada this way.  The cc-with-tweaks.sh script already works
    reasonably well as a wrapper for gnatmake.
    
    gdb/testsuite/ChangeLog
    2019-09-10  Tom Tromey  <tromey@adacore.com>
    
    	* boards/cc-with-tweaks.exp: Set GNATMAKE_FOR_TARGET.

Diff:
---
 gdb/testsuite/ChangeLog                 | 4 ++++
 gdb/testsuite/boards/cc-with-tweaks.exp | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9df3563..a51d22c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2019-09-10  Tom Tromey  <tromey@adacore.com>
 
+	* boards/cc-with-tweaks.exp: Set GNATMAKE_FOR_TARGET.
+
+2019-09-10  Tom Tromey  <tromey@adacore.com>
+
 	* gdb.ada/dgopt.exp: New file.
 	* gdb.ada/dgopt/x.adb: New file.
 
diff --git a/gdb/testsuite/boards/cc-with-tweaks.exp b/gdb/testsuite/boards/cc-with-tweaks.exp
index c50a006..3714814 100644
--- a/gdb/testsuite/boards/cc-with-tweaks.exp
+++ b/gdb/testsuite/boards/cc-with-tweaks.exp
@@ -42,6 +42,7 @@ load_generic_config "unix"
 process_multilib_options ""
 set found_gcc [find_gcc]
 set found_gxx [find_g++]
+set found_gnatmake [find_gnatmake]
 set_board_info compiler "$found_gcc"
 
 set contrib_dir [file normalize $srcdir/../contrib]
@@ -53,6 +54,10 @@ 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"
+if ![info exists GNATMAKE_FOR_TARGET] {
+    set GNATMAKE_FOR_TARGET "$found_gnatmake"
+}
+set GNATMAKE_FOR_TARGET "$contrib_dir/cc-with-tweaks.sh $CC_WITH_TWEAKS_FLAGS $GNATMAKE_FOR_TARGET"
 
 set pwd [exec pwd -P]
 exec echo $GDB $INTERNAL_GDBFLAGS $GDBFLAGS \"\$@\" > $pwd/gdb.sh