JDevlieghere added a comment. @stella.stamenova Would you mind applying this locally and verify if it works for the MSVC generator? It seems to work for the Xcode generator but it's always possible that I missed something. https://reviews.llvm.org/D46334