From 7a336abaa12e18d6f3e36e29c57bd7a2665a33f7 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Fri, 19 Nov 2010 18:24:25 +0000 Subject: gcc-defs.exp (gcc-set-multilib-library-path): Use eval to exec $compiler. * lib/gcc-defs.exp (gcc-set-multilib-library-path): Use eval to exec $compiler. * lib/gfortran.exp (gfortran_link_flags): Remove braces around $GFORTRAN_UNDER_TEST. (gfortran_init): Use -B to specify specpath, add trailing /. From-SVN: r166950 --- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/lib/gcc-defs.exp | 2 +- gcc/testsuite/lib/gfortran.exp | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'gcc') diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d6c4d2b..03e9df1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2010-11-19 Rainer Orth + + * lib/gcc-defs.exp (gcc-set-multilib-library-path): Use eval to + exec $compiler. + * lib/gfortran.exp (gfortran_link_flags): Remove braces around + $GFORTRAN_UNDER_TEST. + (gfortran_init): Use -B to specify specpath, add trailing /. + 2010-11-19 Michael Meissner * gcc.target/powerpc/ppc-target-1.c: New file to test target diff --git a/gcc/testsuite/lib/gcc-defs.exp b/gcc/testsuite/lib/gcc-defs.exp index af898e5a..5942183 100644 --- a/gcc/testsuite/lib/gcc-defs.exp +++ b/gcc/testsuite/lib/gcc-defs.exp @@ -253,7 +253,7 @@ proc gcc-set-multilib-library-path { compiler } { set options [lrange $compiler 1 end] set compiler [lindex $compiler 0] if { [is_remote host] == 0 && [which $compiler] != 0 } { - foreach i "[exec $compiler $options --print-multi-lib]" { + foreach i "[eval exec $compiler $options --print-multi-lib]" { set mldir "" regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir set mldir [string trimright $mldir "\;@"] diff --git a/gcc/testsuite/lib/gfortran.exp b/gcc/testsuite/lib/gfortran.exp index be4e7fe..954dcea 100644 --- a/gcc/testsuite/lib/gfortran.exp +++ b/gcc/testsuite/lib/gfortran.exp @@ -118,7 +118,7 @@ proc gfortran_link_flags { paths } { append flags "-L${gccpath}/libiberty " } append ld_library_path \ - [gcc-set-multilib-library-path { $GFORTRAN_UNDER_TEST } ] + [gcc-set-multilib-library-path $GFORTRAN_UNDER_TEST ] } set_ld_library_path_env_vars @@ -166,7 +166,7 @@ proc gfortran_init { args } { } else { set specpath [get_multilibs] } - set GFORTRAN_UNDER_TEST [findfile $base_dir/../../gfortran "$base_dir/../../gfortran -B$base_dir/../../ -L$specpath/libgfortran" [findfile $base_dir/gfortran "$base_dir/gfortran -B$base_dir/" [transform gfortran]]] + set GFORTRAN_UNDER_TEST [findfile $base_dir/../../gfortran "$base_dir/../../gfortran -B$base_dir/../../ -B$specpath/libgfortran/" [findfile $base_dir/gfortran "$base_dir/gfortran -B$base_dir/" [transform gfortran]]] } } } -- cgit v1.1