New llvm-gcc 2336 patch for CXX_FOR_BUILD