[v3] testsuite vs. cxxflags, others

[Benjamin Kosnik]

Reverting just this part will fix it, no?

-benjamin

> > Index: testsuite/lib/libstdc++.exp
> > ===================================================================
> > --- testsuite/lib/libstdc++.exp	(revision 128221)
> > +++ testsuite/lib/libstdc++.exp	(working copy)
> > @@ -171,13 +171,6 @@
> >  	set compiler [transform "g++"]
> >      }
> >  
> > -    # Default settings.
> > -    set cxx [transform "g++"]
> > -    set cxxflags "-g -O2 -D_GLIBCXX_ASSERT -fmessage-length=0" 
> > -    set cxxldflags ""
> > -    set cc [transform "gcc"]
> > -    # Locate testsuite_hooks.h and other testsuite headers.
> > -    set includes "-I${srcdir}/util"
> >      # Adapt the defaults for special circumstances.
> >      if [is_remote host] {
> >  	# A remote host does not, in general, have access to the
> > @@ -206,6 +199,12 @@
> >  		return "untested"
> >  	    }
> >  	}
> > +	# Default settings.
> > +	set cxx [transform "g++"]
> > +	set cxxflags "-g -O2 -D_GLIBCXX_ASSERT -fmessage-length=0
> > " 
> > +	set cxxldflags ""
> > +	set cc [transform "gcc"]
> > +	# Locate testsuite_hooks.h and other testsuite
> > headers. set includes "-Iutil"
> >      } elseif { [file exists $flags_file] } {
> >          # If we find a testsuite_flags file, we're testing in the
> > build dir. @@ -215,6 +214,9 @@
> >  	set cc [exec sh $flags_file --build-cc]
> >  	set includes [exec sh $flags_file --build-includes]
> >      }