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
This commit is contained in:
Rainer Orth 2010-11-19 18:24:25 +00:00 committed by Rainer Orth
parent fd438373cd
commit 7a336abaa1
3 changed files with 11 additions and 3 deletions

View File

@ -1,3 +1,11 @@
2010-11-19 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* 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 <meissner@linux.vnet.ibm.com>
* gcc.target/powerpc/ppc-target-1.c: New file to test target

View File

@ -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 "\;@"]

View File

@ -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]]]
}
}
}