Fix --disable--std-c, --disable--std-c++ only (don't fix --enable-std-c++11 yet, because that test doesn't pass on clang)