Fix building of all rustc components with -g.
Clean up previous commit to not require an Option