Cope correctly with CXX=clang++ (had previously assumed CXX=clang in travis).