[testsuite] clean up GCC_EXEC_PREFIX use for PR38526
John David Anglin
dave@hiauly1.hia.nrc.ca
Wed Apr 1 23:00:00 GMT 2009
> > --- ./target-libpath.exp.foo =A0 =A02009-03-28 08:39:46.000000000 -0700
> > +++ ./target-libpath.exp =A0 =A0 =A0 =A02009-03-31 18:05:01.000000000 -07=
> 00
> > @@ -213,16 +213,16 @@ proc restore_ld_library_path_env_vars {
> > =A0 global orig_gcc_exec_prefix
> > =A0 global env
> >
> > - =A0if { $orig_environment_saved =3D=3D 0 } {
> > - =A0 =A0return
> > - =A0}
> > -
> > =A0 if { $orig_gcc_exec_prefix_saved } {
> > =A0 =A0 setenv GCC_EXEC_PREFIX "$orig_gcc_exec_prefix"
> > =A0 } elseif [info exists env(GCC_EXEC_PREFIX)] {
> > =A0 =A0 unsetenv GCC_EXEC_PREFIX
> > =A0 }
> >
> > + =A0if { $orig_environment_saved =3D=3D 0 } {
> > + =A0 =A0return
> > + =A0}
> > +
> > =A0 if { $orig_ld_library_path_saved } {
> > =A0 =A0 setenv LD_LIBRARY_PATH "$orig_ld_library_path"
> > =A0 } elseif [info exists env(LD_LIBRARY_PATH)] {
> >
>
> I am checking it in as an obvious fix.
The change doesn't fix the problem on darwin. I also incorrectly reported
that Janis's suggestion worked. It worked when I ran the gcc/g++ tests from
the gcc directory. However, it doesn't work when the tests are run from
the top directory.
Dave
--
J. David Anglin dave.anglin@nrc-cnrc.gc.ca
National Research Council of Canada (613) 990-0752 (FAX: 952-6602)
More information about the Gcc-patches
mailing list