libstdc++-v3-dg.exp (libstdc++-v3-init): Use correct multilib builddir.
* testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Use correct multilib builddir. Properly locate libgcc_s. From-SVN: r45864
This commit is contained in:
parent
47f339cf8d
commit
c20d89f553
|
@ -1,3 +1,9 @@
|
|||
2001-09-28 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
|
||||
|
||||
* testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Use
|
||||
correct multilib builddir.
|
||||
Properly locate libgcc_s.
|
||||
|
||||
2001-09-27 Phil Edwards <pme@gcc.gnu.org>
|
||||
|
||||
* include/std/*: Add Doxygen hooks.
|
||||
|
|
|
@ -44,8 +44,9 @@ proc libstdc++-v3-init { args } {
|
|||
global objdir
|
||||
global gluefile wrap_flags
|
||||
global ld_library_path
|
||||
global tool_root_dir
|
||||
|
||||
set blddir [lookfor_file $outdir libstdc++-v3]
|
||||
set blddir [lookfor_file [get_multilibs] libstdc++-v3]
|
||||
|
||||
# By default, we assume we want to run program images.
|
||||
global dg-do-what-default
|
||||
|
@ -56,9 +57,15 @@ proc libstdc++-v3-init { args } {
|
|||
libstdc++-v3-copy-files [glob -nocomplain "$srcdir/*/*.txt"] $outdir
|
||||
|
||||
# set LD_LIBRARY_PATH so that libgcc_s, libstdc++ binaries can be found.
|
||||
set gccpath [get_multilibs]
|
||||
# locate libgcc.a so we don't need to account for different values of
|
||||
# SHLIB_EXT on different platforms
|
||||
set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
|
||||
if {$gccdir != ""} {
|
||||
set gccdir [file dirname $gccdir]
|
||||
}
|
||||
|
||||
set ld_library_path "."
|
||||
append ld_library_path ":${gccpath}../gcc"
|
||||
append ld_library_path ":${gccdir}"
|
||||
append ld_library_path ":${blddir}/src/.libs"
|
||||
|
||||
# Do a bunch of handstands and backflips for cross compiling and
|
||||
|
|
Loading…
Reference in New Issue