re PR testsuite/40601 (Errors in "make check")

2009-07-01  H.J. Lu  <hongjiu.lu@intel.com>

	PR testsuite/40601
	* testsuite/lib/libffi-dg.exp (libffi-init): Properly set
	gccdir.  Adjust ld_library_path for gcc only if gccdir isn't
	empty.

From-SVN: r149145
This commit is contained in:
H.J. Lu 2009-07-01 17:07:31 +00:00 committed by H.J. Lu
parent 4aa7f896a9
commit 33d1a550c7
2 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,10 @@
2009-07-01 H.J. Lu <hongjiu.lu@intel.com>
PR testsuite/40601
* testsuite/lib/libffi-dg.exp (libffi-init): Properly set
gccdir. Adjust ld_library_path for gcc only if gccdir isn't
empty.
2009-06-30 Richard Sandiford <r.sandiford@uk.ibm.com>
* testsuite/lib/libffi-dg.exp (libffi-init): Don't add "."

View File

@ -108,7 +108,10 @@ proc libffi-init { args } {
verbose "libstdc++ $blddircxx"
set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
add_path ld_library_path [find_libgcc_s "$gccdir/xgcc"]
if {$gccdir != ""} {
set gccdir [file dirname $gccdir]
add_path ld_library_path [find_libgcc_s "$gccdir/xgcc"]
}
# add the library path for libffi.
add_path ld_library_path "${blddirffi}/.libs"
# add the library path for libstdc++ as well.