Commit e4eb817f79

Andrew Kelley <andrew@ziglang.org>
2020-04-06 19:33:32
libc_installation.zig: don't special-case based on C ABI
Whether the C ABI is mingw-w64 or msvc, detection of native libc paths should be the same. In the future we may want to allow passing a C ABI parameter to detectNativeCPaths() but for now we have the same behavior regardless.
master
1 parent 96ed544
Changed files (1)
src-self-hosted
libc_installation.zig
src-self-hosted/libc_installation.zig
@@ -168,29 +168,22 @@ pub const LibCInstallation = struct {
         var self: LibCInstallation = .{};
 
         if (is_windows) {
-            if (is_gnu) {
-                var batch = Batch(FindError!void, 3, .auto_async).init();
-                batch.add(&async self.findNativeIncludeDirPosix(args));
-                batch.add(&async self.findNativeCrtDirPosix(args));
-                try batch.wait();
-            } else {
-                var sdk: *ZigWindowsSDK = undefined;
-                switch (zig_find_windows_sdk(&sdk)) {
-                    .None => {
-                        defer zig_free_windows_sdk(sdk);
-
-                        var batch = Batch(FindError!void, 5, .auto_async).init();
-                        batch.add(&async self.findNativeMsvcIncludeDir(args, sdk));
-                        batch.add(&async self.findNativeMsvcLibDir(args, sdk));
-                        batch.add(&async self.findNativeKernel32LibDir(args, sdk));
-                        batch.add(&async self.findNativeIncludeDirWindows(args, sdk));
-                        batch.add(&async self.findNativeCrtDirWindows(args, sdk));
-                        try batch.wait();
-                    },
-                    .OutOfMemory => return error.OutOfMemory,
-                    .NotFound => return error.WindowsSdkNotFound,
-                    .PathTooLong => return error.WindowsSdkNotFound,
-                }
+            var sdk: *ZigWindowsSDK = undefined;
+            switch (zig_find_windows_sdk(&sdk)) {
+                .None => {
+                    defer zig_free_windows_sdk(sdk);
+
+                    var batch = Batch(FindError!void, 5, .auto_async).init();
+                    batch.add(&async self.findNativeMsvcIncludeDir(args, sdk));
+                    batch.add(&async self.findNativeMsvcLibDir(args, sdk));
+                    batch.add(&async self.findNativeKernel32LibDir(args, sdk));
+                    batch.add(&async self.findNativeIncludeDirWindows(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 {
             try blk: {