Use clang++ again