summaryrefslogtreecommitdiff
path: root/libffi/testsuite
diff options
context:
space:
mode:
authorhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2009-07-01 17:07:31 +0000
committerhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2009-07-01 17:07:31 +0000
commit0378a83e7540272003083f3d37a6d23b5b3e4c4f (patch)
tree01cf6cd3cb790162c8c72a85e2d31539fa19414f /libffi/testsuite
parentc7aa0bd106e4e67f239c7f7a1e079b49e22629da (diff)
downloadgcc-0378a83e7540272003083f3d37a6d23b5b3e4c4f.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149145 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libffi/testsuite')
-rw-r--r--libffi/testsuite/lib/libffi-dg.exp5
1 files changed, 4 insertions, 1 deletions
diff --git a/libffi/testsuite/lib/libffi-dg.exp b/libffi/testsuite/lib/libffi-dg.exp
index 1481360a540..5844f24d570 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.