authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-08-02 23:07:47-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-08-03 02:58:08-07:00
log22662773b2cb0942d5036110eb8db34b25c84c40
tree93f1cb5184d0ea23e87753c58466167efb5e45d0
parente85a46cb84c80a7a97316f066b77e45649ce97fb

LibCInstallation: no longer depends on LLVM

Reverts 4fa8cc736966544da381c90a6111158179fc550b. This check was added because it depended on C++ code, but after 77b96231a6bc195cc482d05599e8c20ee01645a6, this functionality no longer depends on C++ code.

1 files changed, 0 insertions(+), 4 deletions(-)

src/libc_installation.zig-4
...@@ -3,7 +3,6 @@ const builtin = @import("builtin");...@@ -3,7 +3,6 @@ const builtin = @import("builtin");
3const Target = std.Target;3const Target = std.Target;
4const fs = std.fs;4const fs = std.fs;
5const Allocator = std.mem.Allocator;5const Allocator = std.mem.Allocator;
6const build_options = @import("build_options");
76
8const is_darwin = builtin.target.isDarwin();7const is_darwin = builtin.target.isDarwin();
9const is_windows = builtin.target.os.tag == .windows;8const is_windows = builtin.target.os.tag == .windows;
...@@ -184,9 +183,6 @@ pub const LibCInstallation = struct {...@@ -184,9 +183,6 @@ pub const LibCInstallation = struct {
184 if (is_darwin) {183 if (is_darwin) {
185 @panic("Darwin is handled separately via std.zig.system.darwin module");184 @panic("Darwin is handled separately via std.zig.system.darwin module");
186 } else if (is_windows) {185 } else if (is_windows) {
187 if (!build_options.have_llvm)
188 return error.WindowsSdkNotFound;
189
190 var sdk: ZigWindowsSDK = ZigWindowsSDK.find(args.allocator) catch |err| switch (err) {186 var sdk: ZigWindowsSDK = ZigWindowsSDK.find(args.allocator) catch |err| switch (err) {
191 error.NotFound => return error.WindowsSdkNotFound,187 error.NotFound => return error.WindowsSdkNotFound,
192 error.PathTooLong => return error.WindowsSdkNotFound,188 error.PathTooLong => return error.WindowsSdkNotFound,