From fe441584bb9524e07dea468079d6abce859ad03c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Chigot?= Date: Fri, 23 Sep 2022 11:52:54 +0200 Subject: [PATCH] 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. --- binutils/testsuite/config/default.exp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binutils/testsuite/config/default.exp b/binutils/testsuite/config/default.exp index c654bd4081c..68f5bcb1102 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 "" -- 2.30.2