change to clang++ again to match passing master