michaelrj-google wrote: Sorry, was out of the office last week. The correct approach would be to discard the current changes and adjust the copts in the C++ files, then update the cmake to match. https://github.com/llvm/llvm-project/pull/136274