diff options
| -rw-r--r-- | libffi/ChangeLog | 7 | ||||
| -rw-r--r-- | libffi/testsuite/lib/libffi-dg.exp | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index a44375d..e056822 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -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 "." diff --git a/libffi/testsuite/lib/libffi-dg.exp b/libffi/testsuite/lib/libffi-dg.exp index 1481360..5844f24 100644 --- a/libffi/testsuite/lib/libffi-dg.exp +++ b/libffi/testsuite/lib/libffi-dg.exp @@ -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. |