From: Richard Henderson <rth@redhat.com>
Date: Mon, 19 Jan 2015 17:58:06 +0000 (-0800)
Subject: re PR libffi/64607 (Multilib test stops working in libffi)
X-Git-Tag: releases/gcc-5.1.0~1574
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9b8c95973d76f5070ddbdac4a0567ea51775da9;p=thirdparty%2Fgcc.git

re PR libffi/64607 (Multilib test stops working in libffi)

PR libffi/64607

 * testsuite/lib/libffi.exp (libffi-init): Append -L for the
 just built libstdc++.

From-SVN: r219852
---

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index d96b1a55ba37..da17417eab4b 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-19  Richard Henderson  <rth@redhat.com>
+
+	PR libffi/64607
+	* testsuite/lib/libffi.exp (libffi-init): Append -L for the
+	just built libstdc++.
+
 2015-01-15  Dominique d'Humieres  <dominiq@lps.ens.fr>
 	    Richard Henderson  <rth@redhat.com>
 
diff --git a/libffi/testsuite/lib/libffi.exp b/libffi/testsuite/lib/libffi.exp
index b9ef4f10b69c..86ee76639b31 100644
--- a/libffi/testsuite/lib/libffi.exp
+++ b/libffi/testsuite/lib/libffi.exp
@@ -152,6 +152,7 @@ proc libffi-init { args } {
     if { $libffi_dir != "" } {
 	set libffi_dir [file dirname ${libffi_dir}]
 	set libffi_link_flags "-L${libffi_dir}/.libs"
+	lappend libffi_link_flags "-L${blddircxx}/src/.libs"
     }
 
     set_ld_library_path_env_vars