Commit 3432e66faf8940bbbfc7ee24d0e17e6127e66bf6 | zig

author	Andrew Kelley <andrew@ziglang.org> 2022-04-02 19:11:04-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2022-04-02 19:18:41-07:00
log	3432e66faf8940bbbfc7ee24d0e17e6127e66bf6
tree	585b35e886651c8f47970c1985ea84fd98637c3c
parent	843d5adcd6ec0b620fe93e0366aa0e8bb92bd171

stage2: remove dependencies on async functions

This commit removes the tiny amount of dependency on async/await that
the self-hosted compiler has so that it can self-host before async/await
language features are working.

1 files changed, 15 insertions(+), 28 deletions(-)

src
- libc_installation.zig

src/libc_installation.zig+15-28

 @@ -3,7 +3,6 @@ const builtin = @import("builtin");
 const Target = std.Target;
 const fs = std.fs;
 const Allocator = std.mem.Allocator;
-const Batch = std.event.Batch;
 const build_options = @import("build_options");
 const is_darwin = builtin.target.isDarwin();
 @@ -195,40 +194,28 @@ pub const LibCInstallation = struct {
                 .None => {
                     defer sdk.free();
-                    var batch = Batch(FindError!void, 5, .auto_async).init();
+                    try self.findNativeMsvcIncludeDir(args, sdk);
-                    batch.add(&async self.findNativeMsvcIncludeDir(args, sdk));
+                    try self.findNativeMsvcLibDir(args, sdk);
-                    batch.add(&async self.findNativeMsvcLibDir(args, sdk));
+                    try self.findNativeKernel32LibDir(args, sdk);
-                    batch.add(&async self.findNativeKernel32LibDir(args, sdk));
+                    try self.findNativeIncludeDirWindows(args, sdk);
-                    batch.add(&async self.findNativeIncludeDirWindows(args, sdk));
+                    try self.findNativeCrtDirWindows(args, sdk);
-                    batch.add(&async self.findNativeCrtDirWindows(args, sdk));
-                    try batch.wait();
                 },
                 .OutOfMemory => return error.OutOfMemory,
                 .NotFound => return error.WindowsSdkNotFound,
                 .PathTooLong => return error.WindowsSdkNotFound,
             }
         } else if (is_haiku) {
-            try blk: {
+            try self.findNativeIncludeDirPosix(args);
-                var batch = Batch(FindError!void, 2, .auto_async).init();
+            try self.findNativeCrtBeginDirHaiku(args);
-                errdefer batch.wait() catch {};
+            self.crt_dir = try args.allocator.dupeZ(u8, "/system/develop/lib");
-                batch.add(&async self.findNativeIncludeDirPosix(args));
-                batch.add(&async self.findNativeCrtBeginDirHaiku(args));
-                self.crt_dir = try args.allocator.dupeZ(u8, "/system/develop/lib");
-                break :blk batch.wait();
-            };
         } else if (std.process.can_spawn) {
-            try blk: {
+            try self.findNativeIncludeDirPosix(args);
-                var batch = Batch(FindError!void, 2, .auto_async).init();
+            switch (builtin.target.os.tag) {
-                errdefer batch.wait() catch {};
+                .freebsd, .netbsd, .openbsd, .dragonfly => self.crt_dir = try args.allocator.dupeZ(u8, "/usr/lib"),
-                batch.add(&async self.findNativeIncludeDirPosix(args));
+                .solaris => self.crt_dir = try args.allocator.dupeZ(u8, "/usr/lib/64"),
-                switch (builtin.target.os.tag) {
+                .linux => try self.findNativeCrtDirPosix(args),
-                    .freebsd, .netbsd, .openbsd, .dragonfly => self.crt_dir = try args.allocator.dupeZ(u8, "/usr/lib"),
+                else => {},
-                    .solaris => self.crt_dir = try args.allocator.dupeZ(u8, "/usr/lib/64"),
+            }
-                    .linux => batch.add(&async self.findNativeCrtDirPosix(args)),
-                    else => {},
-                }
-                break :blk batch.wait();
-            };
         } else {
             return error.LibCRuntimeNotFound;
         }