OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

g77.exp: set libg2c_dir correctly. 

2001-10-04  Peter Schmid  <schmid@snake.iap.physik.tu-darmstadt.de>

	* lib/g77.exp: set libg2c_dir correctly.

From-SVN: r46013
This commit is contained in:
Peter Schmid 2001-10-04 19:49:54 +00:00 committed by Toon Moene
parent 7f50e2e396
commit d9c28ce3a4
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2001-10-04 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
* lib/g77.exp: set libg2c_dir correctly.
2001-10-02 Neil Booth <neil@daikokuya.demon.co.uk>
* gcc.dg/cpp/macro11.c: New test.

15
gcc/testsuite/lib/g77.exp
View File

@ -116,10 +116,14 @@ proc g77_init { args } {
}
proc g77_target_compile { source dest type options } {
global rootme;
global tmpdir;
global gluefile wrap_flags;
global G77_UNDER_TEST
global TOOL_OPTIONS
global ld_library_path;
set ld_library_path ".:${rootme}"
if { [target_info needs_status_wrapper]!="" && [info exists gluefile] } {
lappend options "libs=${gluefile}"
@ -143,12 +147,21 @@ proc g77_target_compile { source dest type options } {
}
if ![is_remote host] {
set gccpath "[get_multilibs]"
set libg2c_dir [lookfor_file ${gccpath} libf2c/libg2c.a]
set libg2c_dir [lookfor_file ${gccpath} libf2c/libg2c.la]
if { $libg2c_dir != "" } {
set libg2c_link_flags "-L[file dirname ${libg2c_dir}]"
lappend options "additional_flags=${libg2c_link_flags}"
}
}
set g2cpath "[get_multilibs]"
set libg2c_dir [lookfor_file ${g2cpath} libf2c/.libs/libg2c.a]
if { $libg2c_dir != "" } {
set libg2c_dir [file dirname ${libg2c_dir}]
set g2c_link_flags "-L${libg2c_dir}"
lappend options "additional_flags=${g2c_link_flags}"
append ld_library_path ":${libg2c_dir}"
}
lappend options "compiler=$G77_UNDER_TEST"
return [target_compile $source $dest $type $options]
}