g77.exp (default_g77_version): Tweak to make it work in a build directory when nothin...

        * lib/g77.exp (default_g77_version): Tweak to make it work in a build
        directory when nothing has been installed yet.

From-SVN: r20774

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e1d94e5324de4d3a97d4918a251a1f4480585415..27da44aee3d9709acfc257edff0a58e0e08c6c18 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 28 00:37:26 1998  Jeffrey A Law  (law@cygnus.com)
+
+       * lib/g77.exp (default_g77_version): Tweak to make it work in a build
+       directory when nothing has been installed yet.
+
 Sat Jun 27 23:23:18 1998  Carlo Wood  <carlo@runaway.xs4all.nl>
 
        * gcc.c-torture/special/special.exp: Handle newer versions of

diff --git a/gcc/testsuite/lib/g77.exp b/gcc/testsuite/lib/g77.exp
index d4993e70459595ad9b1663ca167afca7699abd8d..3b2beb34b5698b6a6f104fec7fe32667cbae400f 100644 (file)
--- a/gcc/testsuite/lib/g77.exp
+++ b/gcc/testsuite/lib/g77.exp
@@ -51,14 +51,15 @@ proc default_g77_version { } {
 
     # verify that the compiler exists
     if { $compiler_name != 0 } then {
-       set tmp [remote_exec host "$compiler -v"]
-       set status [lindex $tmp 0];
-       set output [lindex $tmp 1];
-       regexp "version.*$" $output version
-       if { $status == 0 && [info exists version] } then {
+        set options ""
+
+        lappend options "additional_flags=-v"
+        set tmp [g77_target_compile "" "" "none" $options]
+       regexp "g77 version\[^\n\]*" $tmp version
+       if { [info exists version] } then {
            clone_output "$compiler_name $version\n"
        } else {
-           clone_output "Couldn't determine version of $compiler_name: $output\n"
+           clone_output "Couldn't determine version of $compiler_name: $tmp\n"
        }
     } else {
        # compiler does not exist (this should have already been detected)