* lib/libgloss.exp (build_wrapper): Use a tool-specific filename on

the host for the testglue.

diff --git a/dejagnu/ChangeLog b/dejagnu/ChangeLog
index d37a576..76bf62b 100644 (file)
--- a/dejagnu/ChangeLog
+++ b/dejagnu/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-26  Richard Earnshaw  <rearnsha@arm.com>
+
+       * lib/libgloss.exp (build_wrapper): Use a tool-specific filename on
+       the host for the testglue.
+
 2002-08-30  Nick Clifton  <nickc@redhat.com>
 
         * acinclude.m4: Provide alternative definition of AC_PROG_CXX

diff --git a/dejagnu/lib/libgloss.exp b/dejagnu/lib/libgloss.exp
index 26335a7..b2ffd21 100644 (file)
--- a/dejagnu/lib/libgloss.exp
+++ b/dejagnu/lib/libgloss.exp
@@ -812,6 +812,7 @@ proc find_ld { } {
 
 proc build_wrapper { gluefile } {
     global libdir
+    global tool
 
     if [target_info exists wrap_m68k_aout] {
        set flags "additional_flags=-DWRAP_M68K_AOUT";
@@ -832,7 +833,7 @@ proc build_wrapper { gluefile } {
        lappend flags "additional_flags=[target_info wrap_compile_flags]";
     }
     if { [target_compile ${libdir}/testglue.c ${gluefile} object $flags] == "" } {
-       set gluefile [remote_download host ${gluefile} testglue.o];
+      set gluefile [remote_download host ${gluefile} ${tool}_tg.o];
        return [list $gluefile $result];
     } else {
        return ""