Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/compiler/build_runner.zig
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,9 @@ pub fn main() !void {
};
}

// Comptime-known guard to prevent including the logic below when `!Watch.have_impl`.
if (!Watch.have_impl) unreachable;

try w.update(gpa, run.step_stack.keys());

// Wait until a file system notification arrives. Read all such events
Expand Down
18 changes: 18 additions & 0 deletions src/main.zig
Original file line number Diff line number Diff line change
Expand Up @@ -4891,6 +4891,7 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
var fetch_mode: Package.Fetch.JobQueue.Mode = .needed;
var system_pkg_dir_path: ?[]const u8 = null;
var debug_target: ?[]const u8 = null;
var debug_libc_paths_file: ?[]const u8 = null;

const argv_index_exe = child_argv.items.len;
_ = try child_argv.addOne();
Expand Down Expand Up @@ -5014,6 +5015,14 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
} else {
warn("Zig was compiled without debug extensions. --debug-target has no effect.", .{});
}
} else if (mem.eql(u8, arg, "--debug-libc")) {
if (i + 1 >= args.len) fatal("expected argument after '{s}'", .{arg});
i += 1;
if (build_options.enable_debug_extensions) {
debug_libc_paths_file = args[i];
} else {
warn("Zig was compiled without debug extensions. --debug-libc has no effect.", .{});
}
} else if (mem.eql(u8, arg, "--verbose-link")) {
verbose_link = true;
} else if (mem.eql(u8, arg, "--verbose-cc")) {
Expand Down Expand Up @@ -5101,6 +5110,14 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
.is_explicit_dynamic_linker = false,
};
};
// Likewise, `--debug-libc` allows overriding the libc installation.
const libc_installation: ?*const LibCInstallation = lci: {
const paths_file = debug_libc_paths_file orelse break :lci null;
if (!build_options.enable_debug_extensions) unreachable;
const lci = try arena.create(LibCInstallation);
lci.* = try .parse(arena, paths_file, &resolved_target.result);
break :lci lci;
};

process.raiseFileDescriptorLimit();

Expand Down Expand Up @@ -5365,6 +5382,7 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
}

const comp = Compilation.create(gpa, arena, .{
.libc_installation = libc_installation,
.dirs = dirs,
.root_name = "build",
.config = config,
Expand Down