aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Chigot <chigot@adacore.com>2022-09-23 11:52:54 +0200
committerClément Chigot <chigot@adacore.com>2022-09-26 17:22:54 +0200
commitfe441584bb9524e07dea468079d6abce859ad03c (patch)
tree9c6c26faf9e6c1e6a329f76c1ef6905bbf8e34ea
parente9d92351722884fda8914021b25e5d5a6cc1a181 (diff)
downloadgdb-fe441584bb9524e07dea468079d6abce859ad03c.zip
gdb-fe441584bb9524e07dea468079d6abce859ad03c.tar.gz
gdb-fe441584bb9524e07dea468079d6abce859ad03c.tar.bz2
binutils/testsuite: handle the different install names of c++filt
c++filt is always named cxxfilt in a build directory, but in a install directory it would be named either cxxfilt or c++filt (depending on the host). Handle this last case in testsuite. binutils/ChangeLog: * testsuite/config/default.exp (CXXFILE): if cxxfilt not found, try c++filt.
-rw-r--r--binutils/testsuite/config/default.exp5
1 files changed, 4 insertions, 1 deletions
diff --git a/binutils/testsuite/config/default.exp b/binutils/testsuite/config/default.exp
index c654bd4..68f5bcb 100644
--- a/binutils/testsuite/config/default.exp
+++ b/binutils/testsuite/config/default.exp
@@ -92,7 +92,10 @@ if ![info exists DLLTOOL] then {
set DLLTOOL [findfile $base_dir/dlltool]
}
if ![info exists CXXFILT] then {
- set CXXFILT [findfile $base_dir/cxxfilt]
+ set CXXFILT [findfile $base_dir/cxxfilt $base_dir/cxxfilt [which [transform cxxfilt]]]
+ if {$CXXFILT == 0} then {
+ set CXXFILT [transform c++filt]
+ }
}
if ![info exists CXXFILTFLAGS] then {
set CXXFILTFLAGS ""