Moxinilian wrote: Also maybe I just misremember what I did at the time and this works for incremental rebuilds if the tool change. I can verify it does if you don’t have time but I don’t have much time either right now so it may take a bit. https://github.com/llvm/llvm-project/pull/145672