From: Iain Sandoe <iains.gcc@gmail.com>
To: gcc-patches@gcc.gnu.org
Cc: ro@CeBiTec.Uni-Bielefeld.DE
Subject: [PATCH] testsuite, libphobos: Update link flags [PR112864].
Date: Sun, 28 Jan 2024 15:03:51 +0000 [thread overview]
Message-ID: <20240128150351.21265-1-iain@sandoe.co.uk> (raw)
Tested on i686, x86_64, aarch64 Darwin, x86_64, aarch64 Linux,
OK for trunk?
thanks,
Iain
--- 8< ---
The regressions here are primarily from duplicated '-B' additions.
We remove the duplicate on the link line.
We also make sure that platforms with extensions other than .so for
shared libs will have the correct paths.
PR target/112864
libphobos/ChangeLog:
* testsuite/lib/libphobos.exp: Use ${shlib_ext} instead of
hard-wiring '.so'.
* testsuite/testsuite_flags.in: Remove duplicate -B option
for spec file path.
---
libphobos/testsuite/lib/libphobos.exp | 2 +-
libphobos/testsuite/testsuite_flags.in | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/libphobos/testsuite/lib/libphobos.exp b/libphobos/testsuite/lib/libphobos.exp
index 191cafa534d..d4aa433ddc1 100644
--- a/libphobos/testsuite/lib/libphobos.exp
+++ b/libphobos/testsuite/lib/libphobos.exp
@@ -234,7 +234,7 @@ proc libphobos_init { args } {
if { "$mldir" == "." } {
continue
}
- if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] >= 1 } {
+ if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.${shlib_ext}*]] >= 1 } {
append ld_library_path ":${gccdir}/${mldir}"
}
}
diff --git a/libphobos/testsuite/testsuite_flags.in b/libphobos/testsuite/testsuite_flags.in
index 528cff4bf13..8a412d2f1fa 100755
--- a/libphobos/testsuite/testsuite_flags.in
+++ b/libphobos/testsuite/testsuite_flags.in
@@ -46,10 +46,8 @@ case ${query} in
echo ${GDCPATHS_default} ${GDCPATHS_config}
;;
--gdcldflags)
- GDCLDFLAGS="-B${BUILD_DIR}/src
- -B${BUILD_DIR}/libdruntime/gcc
- -B${BUILD_DIR}/src/.libs
- -L${BUILD_DIR}/src/.libs"
+ GDCLDFLAGS="-B${BUILD_DIR}/libdruntime/gcc
+ -B${BUILD_DIR}/src/.libs"
echo ${GDCLDFLAGS}
;;
*)
--
2.39.2 (Apple Git-143)
next reply other threads:[~2024-01-28 15:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-28 15:03 Iain Sandoe [this message]
2024-01-28 15:18 ` Iain Buclaw
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=20240128150351.21265-1-iain@sandoe.co.uk \
--to=iains.gcc@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=iain@sandoe.co.uk \
--cc=ro@CeBiTec.Uni-Bielefeld.DE \
/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).