mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-21 16:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts from master branch

Browse Source
This commit is contained in:
Andrew Kelley 2022-11-30 01:58:30 -07:00
parent 6337808e65
commit 9cb06f3b8b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/std/fs/wasi.zig
View File

@ -38,7 +38,7 @@ pub fn preopensAlloc(gpa: Allocator) Allocator.Error!Preopens {
var prestat: prestat_t = undefined;
switch (wasi.fd_prestat_get(fd, &prestat)) {
.SUCCESS => {},
.OPNOTSUPP, .BADF => return .{ .names = names.toOwnedSlice(gpa) },
.OPNOTSUPP, .BADF => return .{ .names = try names.toOwnedSlice(gpa) },
else => @panic("fd_prestat_get: unexpected error"),
}
try names.ensureUnusedCapacity(gpa, 1);

1
src/main.zig
View File

@ -3087,6 +3087,7 @@ fn buildOutputType(
error.SemanticAnalyzeFail => if (!watch) process.exit(1),
else => |e| return e,
};
if (build_options.only_c) return cleanExit();
try comp.makeBinFileExecutable();
if (test_exec_args.items.len == 0 and object_format == .c) default_exec_args: {