[PATH][Ada] Fix multilib handling of gnat.dg when RUNTESTFLAGS is used

Laurent GUERBY laurent@guerby.net
Sat Apr 18 12:34:00 GMT 2009


On Sat, 2009-04-18 at 12:14 +0200, Eric Botcazou wrote:
> > -		set root [file dirname $file]
> > -		set CC "$file -I$root/ada/rts --GCC=$root/xgcc --GNATBIND=$root/gnatbind
> > --GNATLINK=$root/gnatlink -cargs -B$root -largs --GCC=$root/xgcc -B$root
> > -margs"; -	    } else {
> > -		set CC [transform gnatmake]
> > -	    }
> > -	} else {
> > -	    set CC [transform gnatmake]
> > -	}
> > -	return $CC
> > +proc local_find_gnatmake {} {
> > +    global tool_root_dir
> > +
> > +    if ![is_remote host] {
> > +        set file [lookfor_file $tool_root_dir gnatmake]
> > +        if { $file == "" } {
> > +    	set file [lookfor_file $tool_root_dir gcc/gnatmake]
> > +        }
> > +        if { $file != "" } {
> > +    	set root [file dirname $file]
> > +    	set CC "$file --GCC=$root/xgcc --GNATBIND=$root/gnatbind
> > --GNATLINK=$root/gnatlink -cargs -B$root -largs -B$root -margs -B$root"; + 
> >       } else {
> 
> There is a problem though: you have removed --GCC=$root/xgcc from -largs so 
> gnatlink will use 'gcc' to compile and '/usr/bin/gcc' to link.

Oops, sorry for that. I'm testing right now on 4.4 and trunk with the
additional --GCC (and I'll fix the spurious whitespace diff between
trunk and 4.4 on gnat.exp).

Out of curiosity, under what condition does this issue show up?

Laurent




More information about the Gcc-patches mailing list