authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-09-15 00:40:33-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-09-15 00:40:33-07:00
log4fa8cc736966544da381c90a6111158179fc550b
tree6755af53a80b428586083fafa04f888246ab5fef
parent6e9396e32b4f31eb57ac18da510fff1ad24637a0

stage2: don't depend on windows SDK C++ code when unavailable

2 files changed, 5 insertions(+), 0 deletions(-)

BRANCH_TODO+3
...@@ -46,3 +46,6 @@...@@ -46,3 +46,6 @@
46 * there are a couple panic("TODO") in clang options parsing46 * there are a couple panic("TODO") in clang options parsing
47 * std.testing needs improvement to support exposing directory path for its tmp dir (look for "bogus")47 * std.testing needs improvement to support exposing directory path for its tmp dir (look for "bogus")
48 * integrate target features into building assembly code48 * integrate target features into building assembly code
49 * libc_installation.zig: make it look for msvc only if msvc abi is chosen
50 * switch the default C ABI for windows to be mingw-w64
51 * port windows_sdk.cpp to zig
src-self-hosted/libc_installation.zig+2
...@@ -169,6 +169,8 @@ pub const LibCInstallation = struct {...@@ -169,6 +169,8 @@ pub const LibCInstallation = struct {
169 var self: LibCInstallation = .{};169 var self: LibCInstallation = .{};
170170
171 if (is_windows) {171 if (is_windows) {
172 if (!build_options.have_llvm)
173 return error.WindowsSdkNotFound;
172 var sdk: *ZigWindowsSDK = undefined;174 var sdk: *ZigWindowsSDK = undefined;
173 switch (zig_find_windows_sdk(&sdk)) {175 switch (zig_find_windows_sdk(&sdk)) {
174 .None => {176 .None => {