| author | |
| committer | |
| log | e55fa3d525aeb72d0b8efec96daa84c32c38a1c5 |
| tree | 62fd1dd3405075bcd3522c23c78f528088776d9a |
| parent | baa49e59294cb8a637eff7c0b3f07c523c91c18b |
2 files changed, 2 insertions(+), 2 deletions(-)
test/standalone/empty_env/build.zig+1-1| ... | @@ -7,7 +7,7 @@ pub fn build(b: *std.Build) void { | ... | @@ -7,7 +7,7 @@ pub fn build(b: *std.Build) void { |
| 7 | 7 | ||
| 8 | const optimize: std.builtin.OptimizeMode = .Debug; | 8 | const optimize: std.builtin.OptimizeMode = .Debug; |
| 9 | 9 | ||
| 10 | if (builtin.os.tag == .windows and std.process.hasEnvVarConstant("ConEmuHWND")) { | 10 | if (builtin.os.tag == .windows and b.graph.environ_map.contains("ConEmuHWND")) { |
| 11 | // ConEmu injects environment variables into processes before they are executed | 11 | // ConEmu injects environment variables into processes before they are executed |
| 12 | // depending on user settings. This obviously invalidates the test, so skipping | 12 | // depending on user settings. This obviously invalidates the test, so skipping |
| 13 | // it is the best option. | 13 | // it is the best option. |
test/standalone/windows_argv/build.zig+1-1| ... | @@ -67,7 +67,7 @@ pub fn build(b: *std.Build) !void { | ... | @@ -67,7 +67,7 @@ pub fn build(b: *std.Build) !void { |
| 67 | 67 | ||
| 68 | // Only target the MSVC ABI if MSVC/Windows SDK is available | 68 | // Only target the MSVC ABI if MSVC/Windows SDK is available |
| 69 | const has_msvc = has_msvc: { | 69 | const has_msvc = has_msvc: { |
| 70 | const sdk = std.zig.WindowsSdk.find(b.allocator, b.graph.io, builtin.cpu.arch) catch |err| switch (err) { | 70 | const sdk = std.zig.WindowsSdk.find(b.allocator, b.graph.io, builtin.cpu.arch, &b.graph.environ_map) catch |err| switch (err) { |
| 71 | error.OutOfMemory => @panic("oom"), | 71 | error.OutOfMemory => @panic("oom"), |
| 72 | else => break :has_msvc false, | 72 | else => break :has_msvc false, |
| 73 | }; | 73 | }; |