This is the mail archive of the gcc@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

A patch for dejagnu


Hi,

Some people have reported problems with the latest dejagnu and
egcs that dejagnu cannot find the correct libstdc++ and libio.
Here is a patch which seems to work for me.


-- 
H.J. Lu (hjl@gnu.org)
---
--- libgloss.exp.orig	Wed Mar 11 08:26:07 1998
+++ libgloss.exp	Wed Mar 11 09:33:34 1998
@@ -425,14 +425,17 @@
 
 
     # search for the top level multilib directory
-    set multitop [lookfor_file "${comp_base_dir}" "${target_alias}"]
+    set multitop [lookfor_file "${comp_base_dir}" "libraries"]
     if { $multitop == "" } {
-	set multitop [lookfor_file "${comp_base_dir}" "libraries"]
-	if { $multitop == "" } {
-	    set multitop "[lookfor_file ${comp_base_dir} gcc/xgcc]"
-	    if { $multitop != "" } {
-		set multitop [file dirname [file dirname $multitop]];
-	    } else {
+	set multitop "[lookfor_file ${comp_base_dir} gcc/xgcc]"
+	if { $multitop != "" } {
+	    set multitop [file dirname [file dirname $multitop]];
+	} else {
+	    # We search ${target_alias} last since it is only valid
+	    # when we are running dejagnu on an installed gcc. We
+	    # don't want to get it by accident.
+	    set multitop [lookfor_file "${comp_base_dir}" "${target_alias}"]
+	    if { $multitop == "" } {
 		return ""
 	    }
 	}


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]