diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-01-05 13:46:21 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-01-05 13:46:21 -0500 |
| commit | 5d9a8cbe1a1e399284a78a2ac88bb5916f47e87a (patch) | |
| tree | e616a53f075e225287bc880ca507d4cb4b8f2681 /src/os.cpp | |
| parent | 8eae4a096752b7e477d16ee0c5fd40d8871e973a (diff) | |
| parent | e08a4ea62d9814e6c0125ff467f67626f3a22e4f (diff) | |
| download | zig-5d9a8cbe1a1e399284a78a2ac88bb5916f47e87a.tar.gz zig-5d9a8cbe1a1e399284a78a2ac88bb5916f47e87a.zip | |
Merge remote-tracking branch 'origin/master' into llvm6
Diffstat (limited to 'src/os.cpp')
| -rw-r--r-- | src/os.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/os.cpp b/src/os.cpp index a59fa12657..ef12464c8c 100644 --- a/src/os.cpp +++ b/src/os.cpp @@ -1055,6 +1055,11 @@ int os_find_windows_sdk(ZigWindowsSDK **out_sdk) { if (ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { int c0 = 0, c1 = 0, c2 = 0, c3 = 0; sscanf(ffd.cFileName, "%d.%d.%d.%d", &c0, &c1, &c2, &c3); + if (c0 == 10 && c1 == 0 && c2 == 10240 && c3 == 0) { + // Microsoft released 26624 as 10240 accidentally. + // https://developer.microsoft.com/en-us/windows/downloads/sdk-archive + c2 = 26624; + } if ((c0 > v0) || (c1 > v1) || (c2 > v2) || (c3 > v3)) { v0 = c0, v1 = c1, v2 = c2, v3 = c3; buf_init_from_str(&result_sdk->version10, ffd.cFileName); |