authorgravatar for spexguy070@gmail.comMartin Wickham <spexguy070@gmail.com> 2021-09-22 14:39:02-05:00
committergravatar for spexguy070@gmail.comMartin Wickham <spexguy070@gmail.com> 2021-09-22 14:39:02-05:00
logd86678778a6bcc31dc3cb92a286c278de1214c38
tree088979a1981b2c0a8a2201db9532e1b863a823fb
parent4782bededa2987f493a6c02a27b0a248d04cb072

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 {
115115 if (target.isWindows() and target.getAbi() == .gnu) {
116116 // LTO is currently broken on mingw, this can be removed when it's fixed.
117117 exe.want_lto = false;
118 test_stage2.want_lto = false;
118119 }
119120
120121 const exe_options = b.addOptions();
......@@ -501,6 +502,7 @@ fn addStaticLlvmOptionsToExe(
501502 if (exe.target.getOs().tag == .windows) {
502503 exe.linkSystemLibrary("version");
503504 exe.linkSystemLibrary("uuid");
505 exe.linkSystemLibrary("ole32");
504506 }
505507}
506508
test/cases.zig+1-1
......@@ -26,7 +26,7 @@ pub fn addCases(ctx: *TestContext) !void {
2626 var case = ctx.exe("hello world with updates", linux_x64);
2727
2828 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'",
3030 });
3131
3232 // Incorrect return type
test/stage2/darwin.zig+1-1
......@@ -14,7 +14,7 @@ pub fn addCases(ctx: *TestContext) !void {
1414 {
1515 var case = ctx.exe("darwin hello world with updates", target);
1616 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'",
1818 });
1919
2020 // Incorrect return type