Changing to use gcc rather than g++.