[llvm] 8c5aead - [cmake] Pass /winsysroot explicitly

[Shoaib Meenai via llvm-commits]

Author: Shoaib Meenai
Date: 2022-03-04T22:27:59-08:00
New Revision: 8c5aead28df9e142a604bf6dbbb0f7e00099b71a

URL: https://github.com/llvm/llvm-project/commit/8c5aead28df9e142a604bf6dbbb0f7e00099b71a
DIFF: https://github.com/llvm/llvm-project/commit/8c5aead28df9e142a604bf6dbbb0f7e00099b71a.diff

LOG: [cmake] Pass /winsysroot explicitly

We were relying on HandleLLVMOptions adding this flag, but that's not
included in compiler-rt. Add the flag explicitly ourselves to ensure
it's present; the duplication of the flag in the parts of the build
which do include HandleLLVMOptions doesn't cause any issues.

Reviewed By: ychen

Differential Revision: https://reviews.llvm.org/D121033

Added: 
    

Modified: 
    llvm/cmake/platforms/WinMsvc.cmake

Removed: 
    


################################################################################
diff  --git a/llvm/cmake/platforms/WinMsvc.cmake b/llvm/cmake/platforms/WinMsvc.cmake
index 66e650a2de876..a7787b4331371 100644
--- a/llvm/cmake/platforms/WinMsvc.cmake
+++ b/llvm/cmake/platforms/WinMsvc.cmake
@@ -265,7 +265,8 @@ set(COMPILE_FLAGS
     --target=${TRIPLE_ARCH}-windows-msvc
     -fms-compatibility-version=19.20
     -vctoolsversion ${MSVC_VER}
-    -winsdkversion ${WINSDK_VER})
+    -winsdkversion ${WINSDK_VER}
+    -winsysroot ${LLVM_WINSYSROOT})
 
 if(case_sensitive_filesystem)
   # Ensure all sub-configures use the top-level VFS overlay instead of generating their own.