labath added a comment. Sounds that we're agreed then. Can you please update the patch to use `?=` as appropriate? I will update the buildbots to set these variables explicitly as needed, and then we can get this in. https://reviews.llvm.org/D20386