diff options
| author | Tom Tromey <tromey@adacore.com> | 2025-03-31 11:53:53 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2025-04-01 07:11:48 -0600 |
| commit | b63e824775e8ebab501b2d66656ebefd4536e08b (patch) | |
| tree | beb79b7a2a49492709c802732c71a415bd3bcddb /gdb | |
| parent | 71320db6509e0893607e9343b5af56a8c130a2ed (diff) | |
| download | binutils-b63e824775e8ebab501b2d66656ebefd4536e08b.zip binutils-b63e824775e8ebab501b2d66656ebefd4536e08b.tar.gz binutils-b63e824775e8ebab501b2d66656ebefd4536e08b.tar.bz2 | |
Check gnatmake version in gnat_version_compare
Tom de Vries pointed out that my earlier change to
gnat_version_compare made it actually test gcc's version -- not
gnat's.
This patch changes gnat_version_compare to examine gnatmake's version,
while preserving the nicer API.
Approved-By: Tom de Vries <tdevries@suse.de>
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/lib/ada.exp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp index 0a1231b..e1a3a23 100644 --- a/gdb/testsuite/lib/ada.exp +++ b/gdb/testsuite/lib/ada.exp @@ -181,12 +181,16 @@ proc find_ada_tool {tool} { # compiler does not appear to be GCC, this will always return false. proc gnat_version_compare {op l2} { - set gccvers [gcc_major_version] - if {$gccvers == -1} { + set gnatmake [find_gnatmake] + set gnatmake [lindex [split $gnatmake] 0] + if {[catch {exec $gnatmake --version} output]} { + return 0 + } + if {![regexp {GNATMAKE ([0-9]+(\.[0-9]+)*)} $output match version]} { return 0 } - return [version_compare [split $gccvers .] $op $l2] + return [version_compare [split $version .] $op $l2] } # Return 1 if the GNAT runtime appears to have debug info. |