From 9cb06f3b8bf9ea6b5e5307711bc97328762d6a1d Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Wed, 30 Nov 2022 01:58:30 -0700
Subject: [PATCH] fix merge conflicts from master branch

---
 lib/std/fs/wasi.zig | 2 +-
 src/main.zig        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/std/fs/wasi.zig b/lib/std/fs/wasi.zig
index d15f37dc0fe773110412a0acd330106f741df591..fa9de0dff1e59bb2a52d34e4995ab77e7bfae1d3 100644
--- a/lib/std/fs/wasi.zig
+++ b/lib/std/fs/wasi.zig
@@ -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);
diff --git a/src/main.zig b/src/main.zig
index c8ac670d10d1e160f9561032b9ebd2cd957c5127..c73e8acaf87bebd7217c5c281ef100c04800dcdb 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -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: {
-- 
2.54.0