Don't clobber user-defined C[++] compiler.
Merge branch 'master' of github.com:CTSRD-SOAAP/soaap