Fix ERROR: target-cc does not exist

	PR ld/20436
	* testsuite/lib/ld-lib.exp (at_least_gcc_version): Don't ignore
	remote_exec status.
	(check_gcc_plugin_enabled): Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 6e9565c393da45930078b9bd0281462d57d960aa..35e066e8dfd563bab3713300d481e542577b941a 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2016-08-11  Alan Modra  <amodra@gmail.com>
+
+       PR ld/20436
+       * testsuite/lib/ld-lib.exp (at_least_gcc_version): Don't ignore
+       remote_exec status.
+       (check_gcc_plugin_enabled): Likewise.  Revert previous patch.
+
 2016-08-11  Nick Clifton  <nickc@redhat.com>
 
        PR ld/20436

diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 23055bef337b57051701a311c4e2e2acdd38ab4f..7b190bee2a6e787819afe719a7a90bdd3d261bdc 100644 (file)
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -35,9 +35,12 @@ proc at_least_gcc_version { major minor } {
        set CC [find_gcc]
     }
     if { $CC == "" } {
-      return 0
+       return 0
     }
     set state [remote_exec host $CC --version]
+    if { [lindex $state 0] != 0 } {
+       return 0;
+    }
     set tmp "[lindex $state 1]\n"
     # Look for (eg) 4.6.1 in the version output.
     set ver_re "\[^\\.0-9\]+(\[1-9\]\[0-9\]*)\\.(\[0-9\]+)(?:\\.\[0-9\]+)?"
@@ -1816,13 +1819,13 @@ proc check_gcc_plugin_enabled { } {
        set CC [find_gcc]
     }
     if { $CC == ""} {
-      return 0
-    }
-    if { ![is_remote host] && [which $CC] == 0 } then {
-      return 0
+       return 0
     }
     set state [remote_exec host $CC -v]
-    for { set i 0 } { $i < [llength $state] } { incr i } {
+    if { [lindex $state 0] != 0 } {
+       return 0;
+    }
+    for { set i 1 } { $i < [llength $state] } { incr i } {
        set v [lindex $state $i]
        if { [ string match "*--disable-plugin*" $v ] } {
            verbose "plugin is disabled by $v"