aboutsummaryrefslogtreecommitdiff
path: root/libffi
diff options
context:
space:
mode:
authorH.J. Lu <hongjiu.lu@intel.com>2009-07-01 17:07:31 +0000
committerH.J. Lu <hjl@gcc.gnu.org>2009-07-01 10:07:31 -0700
commit33d1a550c72f9270f1ad48fef67d609d2f5f8604 (patch)
tree01cf6cd3cb790162c8c72a85e2d31539fa19414f /libffi
parent4aa7f896a9e7bc90d6db7c4b9ba833e037ea0e7c (diff)
downloadgcc-33d1a550c72f9270f1ad48fef67d609d2f5f8604.zip
gcc-33d1a550c72f9270f1ad48fef67d609d2f5f8604.tar.gz
gcc-33d1a550c72f9270f1ad48fef67d609d2f5f8604.tar.bz2
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
Diffstat (limited to 'libffi')
-rw-r--r--libffi/ChangeLog7
-rw-r--r--libffi/testsuite/lib/libffi-dg.exp5
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.