Leave the final gcc build with disable shared to make things

simpler.  This just makes the build faster, since all we want
at this point is the gcc and g++ binaries...