Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

self-hosted: remove zig libc command for now

Browse Source 
Since it depends on the C++ Windows SDK code. For now, self-hosted is
staying pure self hosted, no C/C++ components.
This commit is contained in:
Andrew Kelley 2020-05-16 13:25:39 -04:00
parent cd5f69794d
commit b0375978ba
1 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src-self-hosted/main.zig
View File

@ -11,8 +11,6 @@ const link = @import("link.zig");
const Package = @import("Package.zig"); const Package = @import("Package.zig");
const zir = @import("zir.zig"); const zir = @import("zir.zig");
const LibCInstallation = @import("libc_installation.zig").LibCInstallation;
// TODO Improve async I/O enough that we feel comfortable doing this. // TODO Improve async I/O enough that we feel comfortable doing this.
//pub const io_mode = .evented; //pub const io_mode = .evented;
@ -33,7 +31,6 @@ const usage =
\\ build-lib [source] Create library from source or object files \\ build-lib [source] Create library from source or object files
\\ build-obj [source] Create object from source or assembly \\ build-obj [source] Create object from source or assembly
\\ fmt [source] Parse file and render in canonical zig format \\ fmt [source] Parse file and render in canonical zig format
\\ libc [paths_file] Display native libc paths file or validate one
\\ targets List available compilation targets \\ targets List available compilation targets
\\ version Print version number and exit \\ version Print version number and exit
\\ zen Print zen of zig and exit \\ zen Print zen of zig and exit
@ -65,8 +62,6 @@ pub fn main() !void {
return buildOutputType(gpa, arena, cmd_args, .Obj); return buildOutputType(gpa, arena, cmd_args, .Obj);
} else if (mem.eql(u8, cmd, "fmt")) { } else if (mem.eql(u8, cmd, "fmt")) {
return cmdFmt(gpa, cmd_args); return cmdFmt(gpa, cmd_args);
} else if (mem.eql(u8, cmd, "libc")) {
return cmdLibC(gpa, cmd_args);
} else if (mem.eql(u8, cmd, "targets")) { } else if (mem.eql(u8, cmd, "targets")) {
const info = try std.zig.system.NativeTargetInfo.detect(arena, .{}); const info = try std.zig.system.NativeTargetInfo.detect(arena, .{});
const stdout = io.getStdOut().outStream(); const stdout = io.getStdOut().outStream();
@ -535,41 +530,6 @@ const Fmt = struct {
const SeenMap = std.BufSet; const SeenMap = std.BufSet;
}; };
fn parseLibcPaths(gpa: *Allocator, libc: *LibCInstallation, libc_paths_file: []const u8) void {
const stderr = io.getStdErr().outStream();
libc.* = LibCInstallation.parse(gpa, libc_paths_file, stderr) catch |err| {
stderr.print("Unable to parse libc path file '{}': {}.\n" ++
"Try running `zig libc` to see an example for the native target.\n", .{
libc_paths_file,
@errorName(err),
}) catch {};
process.exit(1);
};
}
fn cmdLibC(gpa: *Allocator, args: []const []const u8) !void {
const stderr = io.getStdErr().outStream();
switch (args.len) {
0 => {},
1 => {
var libc_installation: LibCInstallation = undefined;
parseLibcPaths(gpa, &libc_installation, args[0]);
return;
},
else => {
try stderr.print("unexpected extra parameter: {}\n", .{args[1]});
process.exit(1);
},
}
const libc = LibCInstallation.findNative(.{ .allocator = gpa }) catch |err| {
stderr.print("unable to find libc: {}\n", .{@errorName(err)}) catch {};
process.exit(1);
};
libc.render(io.getStdOut().outStream()) catch process.exit(1);
}
pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void { pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void {
const stderr_file = io.getStdErr(); const stderr_file = io.getStdErr();
var color: Color = .Auto; var color: Color = .Auto;