From d8bcb00f21f21da751204a6d96ef70cb6b037b97 Mon Sep 17 00:00:00 2001 From: Johannes Pfau Date: Thu, 22 Nov 2018 06:14:47 +0000 Subject: [PATCH] re PR d/87824 (x86_64-linux multilib issues) libphobos/ChangeLog: 2018-11-22 Johannes Pfau PR d/87824 * testsuite/libphobos.shared/shared.exp: Set proper path to phobos library for multilib builds. From-SVN: r266366 --- libphobos/ChangeLog | 6 ++++++ libphobos/testsuite/libphobos.shared/shared.exp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog index 58754bc35af..e95639dbe07 100644 --- a/libphobos/ChangeLog +++ b/libphobos/ChangeLog @@ -1,3 +1,9 @@ +2018-11-22 Johannes Pfau + + PR d/87824 + * testsuite/libphobos.shared/shared.exp: Set proper path to phobos + library for multilib builds. + 2018-11-19 Iain Buclaw * 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 5555b3bdd8a..623e062596a 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 "" }