Skip to content

[WindowsDriver] Always consider WinSdkVersion #130377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 12, 2025
Merged

[WindowsDriver] Always consider WinSdkVersion #130377

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c817d03
[WindowsDriver] Always consider `WinSdkVersion`
Steelskin Mar 8, 2025
a7fd7bc
Use the user-provided version as-is
Steelskin Mar 10, 2025
d1b9c29
Merge branch 'main' into fabrice/msvc-paths-consider-sdk-version
compnerd Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions llvm/lib/WindowsDriver/MSVCPaths.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,22 @@ getHighestNumericTupleInDirectory(llvm::vfs::FileSystem &VFS,
return Highest;
}

static bool getWindows10SDKVersionFromPath(llvm::vfs::FileSystem &VFS,
const std::string &SDKPath,
std::string &SDKVersion) {
static bool getWindows10SDKVersionFromPath(
llvm::vfs::FileSystem &VFS, const std::string &SDKPath,
std::optional<llvm::StringRef> WinSdkVersion, std::string &SDKVersion) {
llvm::SmallString<128> IncludePath(SDKPath);
llvm::sys::path::append(IncludePath, "Include");

if (WinSdkVersion) {
// Use the provided version, if it exists.
llvm::SmallString<128> VersionIncludePath(IncludePath);
llvm::sys::path::append(VersionIncludePath, *WinSdkVersion);
if (VFS.exists(VersionIncludePath)) {
SDKVersion = *WinSdkVersion;
return true;
}
}

SDKVersion = getHighestNumericTupleInDirectory(VFS, IncludePath);
return !SDKVersion.empty();
}
Expand Down Expand Up @@ -122,7 +133,8 @@ static bool getWindowsSDKDirViaCommandLine(
if (!SDKVersion.empty()) {
Major = SDKVersion.getMajor();
Version = SDKVersion.getAsString();
} else if (getWindows10SDKVersionFromPath(VFS, Path, Version)) {
} else if (getWindows10SDKVersionFromPath(VFS, Path, WinSdkVersion,
Version)) {
Major = 10;
}
return true;
Expand Down Expand Up @@ -444,7 +456,8 @@ bool getWindowsSDKDir(vfs::FileSystem &VFS, std::optional<StringRef> WinSdkDir,
return !WindowsSDKLibVersion.empty();
}
if (Major == 10) {
if (!getWindows10SDKVersionFromPath(VFS, Path, WindowsSDKIncludeVersion))
if (!getWindows10SDKVersionFromPath(VFS, Path, WinSdkVersion,
WindowsSDKIncludeVersion))
return false;
WindowsSDKLibVersion = WindowsSDKIncludeVersion;
return true;
Expand Down Expand Up @@ -475,7 +488,7 @@ bool getUniversalCRTSdkDir(vfs::FileSystem &VFS,
Path, nullptr))
return false;

return getWindows10SDKVersionFromPath(VFS, Path, UCRTVersion);
return getWindows10SDKVersionFromPath(VFS, Path, WinSdkVersion, UCRTVersion);
}

bool findVCToolChainViaCommandLine(vfs::FileSystem &VFS,
Expand Down
Loading