🍒 [WindowsDriver] Always consider WinSdkVersion (llvm#130377)
#10301
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Cherry-picked from llvm#10240 Currently, the `-Xmicrosoft-windows-sdk-version` is only used if `-Xmicrosoft-windows-sdk-root` is also provided. This is a surprising behavior since the argument should still be taking effect if LLVM uses the Windows SDK root from the registry. Tested locally in a simple Hello World program including `Windows.h` and compiled with `-Xmicrosoft-windows-sdk-version 10.0.18362.0` on a system where the SDK 10.0.22621.0 is also installed and verified that the correct header was included. Co-authored-by: Saleem Abdulrasool <[email protected]> (cherrry picked from commit [606e9fa](swiftlang@606e9fa)
compnerd
approved these changes
Mar 20, 2025
|
@swift-ci please test |
airspeedswift
approved these changes
Mar 24, 2025
fredriss
approved these changes
Mar 25, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, the
-Xmicrosoft-windows-sdk-versionis only used if-Xmicrosoft-windows-sdk-rootis also provided. This is a surprising behavior since the argument should still be taking effect if LLVM uses the Windows SDK root from the registry.The changes are tailored to only take effect when
-Xmicrosoft-windows-sdk-versionis specified but-Xmicrosoft-windows-sdk-rootis not. It is very likely that the caller intent was to use a specific Windows SDK version in this case, though it was not happening.N/A
Original LLVM PR [WindowsDriver] Always consider
WinSdkVersionllvm/llvm-project#130377Cherry-picked from 🍒 [WindowsDriver] Always consider
WinSdkVersion(llvm#130377) #10240Very low. Should be a no-op for most users.
Tested locally in a simple Hello World program including
Windows.hand compiled with-Xmicrosoft-windows-sdk-version 10.0.18362.0on a system where the SDK 10.0.22621.0 is also installed and verified that the correct header was included.@compnerd