From 8a51616424828e6204a20436a719f98436f5d5ea Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 9 Jul 2019 13:51:26 -0600 Subject: [PATCH] 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 * boards/cc-with-tweaks.exp: Set GNATMAKE_FOR_TARGET. --- 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 9df3563c47f..a51d22ce22f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-09-10 Tom Tromey + + * boards/cc-with-tweaks.exp: Set GNATMAKE_FOR_TARGET. + 2019-09-10 Tom Tromey * gdb.ada/dgopt.exp: New file. diff --git a/gdb/testsuite/boards/cc-with-tweaks.exp b/gdb/testsuite/boards/cc-with-tweaks.exp index c50a0065c28..371481477ae 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 -- 2.30.2