| author |  Martin Wickham <spexguy070@gmail.com> 2021-09-22 14:39:02-05:00 |
| committer | Martin Wickham <spexguy070@gmail.com> 2021-09-22 14:39:02-05:00 |
| log | d86678778a6bcc31dc3cb92a286c278de1214c38 |
| tree | 088979a1981b2c0a8a2201db9532e1b863a823fb |
| parent | 4782bededa2987f493a6c02a27b0a248d04cb072 |
Fix failing tests and windows link dependencies
3 files changed, 4 insertions(+), 2 deletions(-)
build.zig+2
| ... | @@ -115,6 +115,7 @@ pub fn build(b: *Builder) !void { | ... | @@ -115,6 +115,7 @@ pub fn build(b: *Builder) !void { |
| 115 | if (target.isWindows() and target.getAbi() == .gnu) { | 115 | if (target.isWindows() and target.getAbi() == .gnu) { |
| 116 | // LTO is currently broken on mingw, this can be removed when it's fixed. | 116 | // LTO is currently broken on mingw, this can be removed when it's fixed. |
| 117 | exe.want_lto = false; | 117 | exe.want_lto = false; |
| 118 | test_stage2.want_lto = false; | ||
| 118 | } | 119 | } |
| 119 | 120 | ||
| 120 | const exe_options = b.addOptions(); | 121 | const exe_options = b.addOptions(); |
| ... | @@ -501,6 +502,7 @@ fn addStaticLlvmOptionsToExe( | ... | @@ -501,6 +502,7 @@ fn addStaticLlvmOptionsToExe( |
| 501 | if (exe.target.getOs().tag == .windows) { | 502 | if (exe.target.getOs().tag == .windows) { |
| 502 | exe.linkSystemLibrary("version"); | 503 | exe.linkSystemLibrary("version"); |
| 503 | exe.linkSystemLibrary("uuid"); | 504 | exe.linkSystemLibrary("uuid"); |
| 505 | exe.linkSystemLibrary("ole32"); | ||
| 504 | } | 506 | } |
| 505 | } | 507 | } |
| 506 | 508 |
test/cases.zig+1-1
| ... | @@ -26,7 +26,7 @@ pub fn addCases(ctx: *TestContext) !void { | ... | @@ -26,7 +26,7 @@ pub fn addCases(ctx: *TestContext) !void { |
| 26 | var case = ctx.exe("hello world with updates", linux_x64); | 26 | var case = ctx.exe("hello world with updates", linux_x64); |
| 27 | 27 | ||
| 28 | case.addError("", &[_][]const u8{ | 28 | case.addError("", &[_][]const u8{ |
| 29 | ":95:9: error: struct 'tmp.tmp' has no member named 'main'", | 29 | ":97:9: error: struct 'tmp.tmp' has no member named 'main'", |
| 30 | }); | 30 | }); |
| 31 | 31 | ||
| 32 | // Incorrect return type | 32 | // Incorrect return type |
test/stage2/darwin.zig+1-1
| ... | @@ -14,7 +14,7 @@ pub fn addCases(ctx: *TestContext) !void { | ... | @@ -14,7 +14,7 @@ pub fn addCases(ctx: *TestContext) !void { |
| 14 | { | 14 | { |
| 15 | var case = ctx.exe("darwin hello world with updates", target); | 15 | var case = ctx.exe("darwin hello world with updates", target); |
| 16 | case.addError("", &[_][]const u8{ | 16 | case.addError("", &[_][]const u8{ |
| 17 | ":95:9: error: struct 'tmp.tmp' has no member named 'main'", | 17 | ":97:9: error: struct 'tmp.tmp' has no member named 'main'", |
| 18 | }); | 18 | }); |
| 19 | 19 | ||
| 20 | // Incorrect return type | 20 | // Incorrect return type |