diff options
| author | Anthony Green <green@moxielogic.com> | 2011-02-08 17:04:26 -0500 |
|---|---|---|
| committer | Anthony Green <green@moxielogic.com> | 2011-02-08 17:04:26 -0500 |
| commit | bc9d0be2958ce475757f34dd2c878948aa77a39f (patch) | |
| tree | 9fc75fe0f33e6b10acd44746229222f48d9d37e4 /testsuite/lib | |
| parent | 3b836249feae6d08d3e6887486e4b9961ddafa09 (diff) | |
| download | libffi-bc9d0be2958ce475757f34dd2c878948aa77a39f.tar.gz | |
3.0.10rc0 changes
Diffstat (limited to 'testsuite/lib')
| -rw-r--r-- | testsuite/lib/libffi.exp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/testsuite/lib/libffi.exp b/testsuite/lib/libffi.exp index 82d6652..b5b4c72 100644 --- a/testsuite/lib/libffi.exp +++ b/testsuite/lib/libffi.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2003, 2005, 2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2003, 2005, 2008-2011 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ proc load_gcc_lib { filename } { global srcdir - load_file $srcdir/../../gcc/testsuite/lib/$filename + load_file $srcdir/lib/$filename } load_lib dg.exp @@ -94,7 +94,6 @@ proc libffi-init { args } { global srcdir global blddirffi global objdir - global blddircxx global TOOL_OPTIONS global tool global libffi_include @@ -102,10 +101,8 @@ proc libffi-init { args } { global tool_root_dir global ld_library_path - set blddirffi [lookfor_file [get_multilibs] libffi] + set blddirffi [pwd]/.. verbose "libffi $blddirffi" - set blddircxx [lookfor_file [get_multilibs] libstdc++-v3] - verbose "libstdc++ $blddircxx" set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a] if {$gccdir != ""} { @@ -132,8 +129,6 @@ proc libffi-init { args } { } # add the library path for libffi. append ld_library_path ":${blddirffi}/.libs" - # add the library path for libstdc++ as well. - append ld_library_path ":${blddircxx}/src/.libs" verbose "ld_library_path: $ld_library_path" @@ -146,7 +141,6 @@ 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 |