From: "Clément Chigot" <chigot@adacore.com>
To: binutils@sourceware.org
Cc: "Clément Chigot" <chigot@adacore.com>
Subject: [PATCH] binutils/testsuite: handle the different install names of c++filt
Date: Mon, 26 Sep 2022 16:11:22 +0200 [thread overview]
Message-ID: <20220926141122.164016-1-chigot@adacore.com> (raw)
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.25.1
next reply other threads:[~2022-09-26 14:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-26 14:11 Clément Chigot [this message]
2022-09-26 15:22 ` Nick Clifton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220926141122.164016-1-chigot@adacore.com \
--to=chigot@adacore.com \
--cc=binutils@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).