diff options
| -rw-r--r-- | libphobos/ChangeLog | 6 | ||||
| -rw-r--r-- | libphobos/testsuite/libphobos.shared/shared.exp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog index 58754bc..e95639d 100644 --- 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 5555b3b..623e062 100644 --- 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 "" } |