diff options
| author | Ben Elliston <bje@gnu.org> | 2011-06-30 09:38:10 +1000 |
|---|---|---|
| committer | Ben Elliston <bje@gnu.org> | 2011-06-30 09:38:10 +1000 |
| commit | 6a76be5ff4edc64adc6478f8403a07a5dcd1e30f (patch) | |
| tree | 8f0a35544d0a5d64fdd925a9baf0ffb01ddc5c48 /lib | |
| parent | bc123e2c554cc4e62a4ed46fbafb92a95a58819f (diff) | |
| download | dejagnu-6a76be5ff4edc64adc6478f8403a07a5dcd1e30f.zip dejagnu-6a76be5ff4edc64adc6478f8403a07a5dcd1e30f.tar.gz dejagnu-6a76be5ff4edc64adc6478f8403a07a5dcd1e30f.tar.bz2 | |
2011-06-30 Tom Tromey <tromey@redhat.com>
* doc/ref.xml: Document find_gfortran.
* doc/dejagnu.texi: Regenerate.
* lib/target.exp (default_target_compile): Handle f90.
(default_target_compile): Likewise.
* lib/libgloss.exp (find_gfortran): New proc.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libgloss.exp | 21 | ||||
| -rw-r--r-- | lib/target.exp | 21 |
2 files changed, 40 insertions, 2 deletions
diff --git a/lib/libgloss.exp b/lib/libgloss.exp index e651eb6..77150cb 100644 --- a/lib/libgloss.exp +++ b/lib/libgloss.exp @@ -1,5 +1,5 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -702,6 +702,25 @@ proc find_g77 {} { return $CC } +proc find_gfortran {} { + global tool_root_dir + + if {![is_remote host]} { + set file [lookfor_file $tool_root_dir gfortran] + if { $file == "" } { + set file [lookfor_file $tool_root_dir gcc/gfortran] + } + if { $file != "" } { + set CC "$file -B[file dirname $file]/" + } else { + set CC [transform gfortran] + } + } else { + set CC [transform gfortran] + } + return $CC +} + proc find_gnatmake {} { global tool_root_dir diff --git a/lib/target.exp b/lib/target.exp index c9fde2c..ec9fff2 100644 --- a/lib/target.exp +++ b/lib/target.exp @@ -1,5 +1,5 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -367,6 +367,18 @@ proc default_target_compile {source destfile type options} { } } + if { $i == "f90" } { + set compiler_type "f90" + if {[board_info $dest exists f90flags]} { + append add_flags " [target_info f90flags]" + } + if {[board_info $dest exists f90compiler]} { + set compiler [target_info f90compiler] + } else { + set compiler [find_gfortran] + } + } + if {[regexp "^dest=" $i]} { regsub "^dest=" $i "" tmp if {[board_info $tmp exists name]} { @@ -420,6 +432,7 @@ proc default_target_compile {source destfile type options} { global CC_FOR_TARGET global CXX_FOR_TARGET global F77_FOR_TARGET + global F90_FOR_TARGET global GNATMAKE_FOR_TARGET if {[info exists GNATMAKE_FOR_TARGET]} { @@ -446,6 +459,12 @@ proc default_target_compile {source destfile type options} { } } + if {[info exists F90_FOR_TARGET]} { + if { $compiler_type == "f90" } { + set compiler $F90_FOR_TARGET + } + } + if { $compiler == "" } { set compiler [board_info $dest compiler] if { $compiler == "" } { |