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)