re PR d/87824 (x86_64-linux multilib issues)

libphobos/ChangeLog:

2018-11-22  Johannes Pfau  <johannespfau@gmail.com>

	PR d/87824
	* testsuite/libphobos.shared/shared.exp: Set proper path to phobos
	library for multilib builds.

From-SVN: r266366

diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog
index 58754bc35afaf9b3fcfcda520d0efdbdc7df36d0..e95639dbe074998ab55d7243efd0496d3c7f0c22 100644 (file)
--- a/libphobos/ChangeLog
+++ b/libphobos/ChangeLog
@@ -1,3 +1,9 @@
+2018-11-22  Johannes Pfau  <johannespfau@gmail.com>
+
+       PR d/87824
+       * testsuite/libphobos.shared/shared.exp: Set proper path to phobos
+       library for multilib builds.
+
 2018-11-19  Iain Buclaw  <ibuclaw@gdcproject.org>
 
        * src/Makefile.am: Remove std.internal.digest.sha_SSSE3 and

diff --git a/libphobos/testsuite/libphobos.shared/shared.exp b/libphobos/testsuite/libphobos.shared/shared.exp
index 5555b3bdd8af422c2eb9c99c24a4df608064813c..623e062596a355900d500b118356f59be38e87b7 100644 (file)
--- a/libphobos/testsuite/libphobos.shared/shared.exp
+++ b/libphobos/testsuite/libphobos.shared/shared.exp
@@ -94,7 +94,7 @@ if { [is-effective-target dlopen] && [is-effective-target pthread] } {
     dg-test "$srcdir/$subdir/host.c" "-ldl -pthread" "$DEFAULT_CFLAGS"
 
     # Test requires a command line argument to be passed to the program.
-    set libphobos_run_args "$objdir/../src/.libs/libgphobos.so"
+    set libphobos_run_args "${blddir}/src/.libs/libgphobos.${shlib_ext}"
     dg-test "$srcdir/$subdir/loadDR.c" "-ldl -pthread -g" "$DEFAULT_CFLAGS"
     set libphobos_run_args ""
 }