Fix compiler detection with clang-cl (#5816) * Fix compiler detection with clang-cl * Follow review suggestion