authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-11-30 01:58:30-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-12-06 12:15:04-07:00
log9cb06f3b8bf9ea6b5e5307711bc97328762d6a1d
tree8de05a9471692ef22f09cbf9690abe64ecda45c5
parent6337808e65fd274fa15acf9df051136661cba515

fix merge conflicts from master branch

2 files changed, 2 insertions(+), 1 deletions(-)

lib/std/fs/wasi.zig+1-1
...@@ -38,7 +38,7 @@ pub fn preopensAlloc(gpa: Allocator) Allocator.Error!Preopens {...@@ -38,7 +38,7 @@ pub fn preopensAlloc(gpa: Allocator) Allocator.Error!Preopens {
38 var prestat: prestat_t = undefined;38 var prestat: prestat_t = undefined;
39 switch (wasi.fd_prestat_get(fd, &prestat)) {39 switch (wasi.fd_prestat_get(fd, &prestat)) {
40 .SUCCESS => {},40 .SUCCESS => {},
41 .OPNOTSUPP, .BADF => return .{ .names = names.toOwnedSlice(gpa) },41 .OPNOTSUPP, .BADF => return .{ .names = try names.toOwnedSlice(gpa) },
42 else => @panic("fd_prestat_get: unexpected error"),42 else => @panic("fd_prestat_get: unexpected error"),
43 }43 }
44 try names.ensureUnusedCapacity(gpa, 1);44 try names.ensureUnusedCapacity(gpa, 1);
src/main.zig+1
...@@ -3087,6 +3087,7 @@ fn buildOutputType(...@@ -3087,6 +3087,7 @@ fn buildOutputType(
3087 error.SemanticAnalyzeFail => if (!watch) process.exit(1),3087 error.SemanticAnalyzeFail => if (!watch) process.exit(1),
3088 else => |e| return e,3088 else => |e| return e,
3089 };3089 };
3090 if (build_options.only_c) return cleanExit();
3090 try comp.makeBinFileExecutable();3091 try comp.makeBinFileExecutable();
30913092
3092 if (test_exec_args.items.len == 0 and object_format == .c) default_exec_args: {3093 if (test_exec_args.items.len == 0 and object_format == .c) default_exec_args: {