From bca3073692c0858f4b8151faaf8ccd963541e787 Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Tue, 3 Sep 2019 08:24:03 +0000 Subject: [PATCH] libphobos.exp (libphobos_init): Add multi-lib libgcc dirs to the ld_library_path var. 2019-09-03 Bernd Edlinger * testsuite/lib/libphobos.exp (libphobos_init): Add multi-lib libgcc dirs to the ld_library_path var. From-SVN: r275332 --- libphobos/ChangeLog | 5 +++++ libphobos/testsuite/lib/libphobos.exp | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog index 76b13f49e69..80730c885b9 100644 --- a/libphobos/ChangeLog +++ b/libphobos/ChangeLog @@ -1,3 +1,8 @@ +2019-09-03 Bernd Edlinger + + * testsuite/lib/libphobos.exp (libphobos_init): Add multi-lib libgcc + dirs to the ld_library_path var. + 2019-08-20 Iain Buclaw * libdruntime/Makefile.am (DRUNTIME_DSOURCES_BIONIC): Add diff --git a/libphobos/testsuite/lib/libphobos.exp b/libphobos/testsuite/lib/libphobos.exp index d3fe75358c8..056e8f1d444 100644 --- a/libphobos/testsuite/lib/libphobos.exp +++ b/libphobos/testsuite/lib/libphobos.exp @@ -170,6 +170,25 @@ proc libphobos_init { args } { append ld_library_path ":${blddir}/src/.libs" } + # Compute what needs to be added to the existing LD_LIBRARY_PATH. + if {$gccdir != ""} { + set compiler ${gccdir}/gdc + + if { [is_remote host] == 0 && [which $compiler] != 0 } { + foreach i "[exec $compiler --print-multi-lib]" { + set mldir "" + regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir + set mldir [string trimright $mldir "\;@"] + if { "$mldir" == "." } { + continue + } + if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] >= 1 } { + append ld_library_path ":${gccdir}/${mldir}" + } + } + } + } + set_ld_library_path_env_vars libphobos_maybe_build_wrapper "${objdir}/testglue.o" -- 2.30.2