mirror of
https://github.com/ziglang/zig.git
synced 2024-11-15 08:33:06 +00:00
Merge pull request #18622 from ziglang/zig-mod-edge-case
build system: better handle modules that do not have a zig root source file
This commit is contained in:
Andrew Kelley
GitHub
commit
5c4cb60f4f
@ -1220,15 +1220,18 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
|
||||
}
|
||||
}
|
||||
|
||||
// The CLI assumes if it sees a --mod argument that it is a zig
|
||||
// compilation unit. If there is no root source file, then this
|
||||
// is not a zig compilation unit - it is perhaps a set of
|
||||
// linker objects, or C source files instead.
|
||||
// In such case, there will be only one module, so we can leave
|
||||
// off the naming here.
|
||||
// When the CLI sees a -M argument, it determines whether it
|
||||
// implies the existence of a Zig compilation unit based on
|
||||
// whether there is a root source file. If there is no root
|
||||
// source file, then this is not a zig compilation unit - it is
|
||||
// perhaps a set of linker objects, or C source files instead.
|
||||
// Linker objects are added to the CLI globally, while C source
|
||||
// files must have a module parent.
|
||||
if (module.root_source_file) |lp| {
|
||||
const src = lp.getPath2(module.owner, step);
|
||||
try zig_args.appendSlice(&.{ "--mod", module_cli_name, src });
|
||||
try zig_args.append(b.fmt("-M{s}={s}", .{ module_cli_name, src }));
|
||||
} else if (moduleNeedsCliArg(module)) {
|
||||
try zig_args.append(b.fmt("-M{s}", .{module_cli_name}));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1850,3 +1853,10 @@ pub fn rootModuleTarget(c: *Compile) std.Target {
|
||||
// The root module is always given a target, so we know this to be non-null.
|
||||
return c.root_module.resolved_target.?.result;
|
||||
}
|
||||
|
||||
fn moduleNeedsCliArg(mod: *const Module) bool {
|
||||
return for (mod.link_objects.items) |o| switch (o) {
|
||||
.c_source_file, .c_source_files, .assembly_file, .win32_resource_file => break true,
|
||||
else => continue,
|
||||
} else false;
|
||||
}
|
||||
|
||||
@ -1172,7 +1172,7 @@ fn addModuleTableToCacheHash(
|
||||
hash.addOptionalBytes(mod.root.root_dir.path);
|
||||
hash.addBytes(mod.root.sub_path);
|
||||
},
|
||||
.files => |man| {
|
||||
.files => |man| if (mod.root_src_path.len != 0) {
|
||||
const pkg_zig_file = try mod.root.joinString(arena, mod.root_src_path);
|
||||
_ = try man.addFile(pkg_zig_file, null);
|
||||
},
|
||||
@ -2469,8 +2469,6 @@ fn addNonIncrementalStuffToCacheManifest(
|
||||
comptime assert(link_hash_implementation_version == 11);
|
||||
|
||||
if (comp.module) |mod| {
|
||||
const main_zig_file = try mod.main_mod.root.joinString(arena, mod.main_mod.root_src_path);
|
||||
_ = try man.addFile(main_zig_file, null);
|
||||
try addModuleTableToCacheHash(gpa, arena, &man.hash, mod.root_mod, mod.main_mod, .{ .files = man });
|
||||
|
||||
// Synchronize with other matching comments: ZigOnlyHashStuff
|
||||
|
||||
160
src/main.zig
160
src/main.zig
@ -409,10 +409,10 @@ const usage_build_generic =
|
||||
\\ --libc [file] Provide a file which specifies libc paths
|
||||
\\ -x language Treat subsequent input files as having type <language>
|
||||
\\ --dep [[import=]name] Add an entry to the next module's import table
|
||||
\\ --mod [name] [src] Create a module based on the current per-module settings.
|
||||
\\ -M[name][=src] Create a module based on the current per-module settings.
|
||||
\\ The first module is the main module.
|
||||
\\ "std" can be configured by leaving src blank.
|
||||
\\ After a --mod argument, per-module settings are reset.
|
||||
\\ "std" can be configured by omitting src
|
||||
\\ After a -M argument, per-module settings are reset.
|
||||
\\ --error-limit [num] Set the maximum amount of distinct error values
|
||||
\\ -fllvm Force using LLVM as the codegen backend
|
||||
\\ -fno-llvm Prevent using LLVM as the codegen backend
|
||||
@ -1040,56 +1040,39 @@ fn buildOutputType(
|
||||
.value = value,
|
||||
});
|
||||
} else if (mem.eql(u8, arg, "--mod")) {
|
||||
const mod_name = args_iter.nextOrFatal();
|
||||
const root_src_orig = args_iter.nextOrFatal();
|
||||
|
||||
const gop = try create_module.modules.getOrPut(arena, mod_name);
|
||||
|
||||
if (gop.found_existing) {
|
||||
fatal("unable to add module '{s}': already exists as '{s}'", .{
|
||||
mod_name, gop.value_ptr.paths.root_src_path,
|
||||
});
|
||||
}
|
||||
|
||||
// See duplicate logic: ModCreationGlobalFlags
|
||||
create_module.opts.have_zcu = true;
|
||||
if (mod_opts.single_threaded == false)
|
||||
create_module.opts.any_non_single_threaded = true;
|
||||
if (mod_opts.sanitize_thread == true)
|
||||
create_module.opts.any_sanitize_thread = true;
|
||||
if (mod_opts.unwind_tables == true)
|
||||
create_module.opts.any_unwind_tables = true;
|
||||
if (mod_opts.strip == false)
|
||||
create_module.opts.any_non_stripped = true;
|
||||
if (mod_opts.error_tracing == true)
|
||||
create_module.opts.any_error_tracing = true;
|
||||
|
||||
const root_src = try introspect.resolvePath(arena, root_src_orig);
|
||||
gop.value_ptr.* = .{
|
||||
.paths = .{
|
||||
.root = .{
|
||||
.root_dir = Cache.Directory.cwd(),
|
||||
.sub_path = fs.path.dirname(root_src) orelse "",
|
||||
},
|
||||
.root_src_path = fs.path.basename(root_src),
|
||||
},
|
||||
.cc_argv = try cc_argv.toOwnedSlice(arena),
|
||||
.inherited = mod_opts,
|
||||
.target_arch_os_abi = target_arch_os_abi,
|
||||
.target_mcpu = target_mcpu,
|
||||
.deps = try deps.toOwnedSlice(arena),
|
||||
.resolved = null,
|
||||
.c_source_files_start = c_source_files_owner_index,
|
||||
.c_source_files_end = create_module.c_source_files.items.len,
|
||||
.rc_source_files_start = rc_source_files_owner_index,
|
||||
.rc_source_files_end = create_module.rc_source_files.items.len,
|
||||
};
|
||||
cssan.reset();
|
||||
mod_opts = .{};
|
||||
target_arch_os_abi = null;
|
||||
target_mcpu = null;
|
||||
c_source_files_owner_index = create_module.c_source_files.items.len;
|
||||
rc_source_files_owner_index = create_module.rc_source_files.items.len;
|
||||
// deprecated, kept around until the next zig1.wasm update
|
||||
try handleModArg(
|
||||
arena,
|
||||
args_iter.nextOrFatal(),
|
||||
args_iter.nextOrFatal(),
|
||||
&create_module,
|
||||
&mod_opts,
|
||||
&cc_argv,
|
||||
&target_arch_os_abi,
|
||||
&target_mcpu,
|
||||
&deps,
|
||||
&c_source_files_owner_index,
|
||||
&rc_source_files_owner_index,
|
||||
&cssan,
|
||||
);
|
||||
} else if (mem.startsWith(u8, arg, "-M")) {
|
||||
var it = mem.splitScalar(u8, arg["-M".len..], '=');
|
||||
const mod_name = it.next().?;
|
||||
const root_src_orig = it.next();
|
||||
try handleModArg(
|
||||
arena,
|
||||
mod_name,
|
||||
root_src_orig,
|
||||
&create_module,
|
||||
&mod_opts,
|
||||
&cc_argv,
|
||||
&target_arch_os_abi,
|
||||
&target_mcpu,
|
||||
&deps,
|
||||
&c_source_files_owner_index,
|
||||
&rc_source_files_owner_index,
|
||||
&cssan,
|
||||
);
|
||||
} else if (mem.eql(u8, arg, "--error-limit")) {
|
||||
const next_arg = args_iter.nextOrFatal();
|
||||
error_limit = std.fmt.parseUnsigned(Module.ErrorInt, next_arg, 0) catch |err| {
|
||||
@ -7810,3 +7793,74 @@ fn parseImageBase(s: []const u8) u64 {
|
||||
return std.fmt.parseUnsigned(u64, s, 0) catch |err|
|
||||
fatal("unable to parse image base '{s}': {s}", .{ s, @errorName(err) });
|
||||
}
|
||||
|
||||
fn handleModArg(
|
||||
arena: Allocator,
|
||||
mod_name: []const u8,
|
||||
opt_root_src_orig: ?[]const u8,
|
||||
create_module: *CreateModule,
|
||||
mod_opts: *Package.Module.CreateOptions.Inherited,
|
||||
cc_argv: *std.ArrayListUnmanaged([]const u8),
|
||||
target_arch_os_abi: *?[]const u8,
|
||||
target_mcpu: *?[]const u8,
|
||||
deps: *std.ArrayListUnmanaged(CliModule.Dep),
|
||||
c_source_files_owner_index: *usize,
|
||||
rc_source_files_owner_index: *usize,
|
||||
cssan: *ClangSearchSanitizer,
|
||||
) !void {
|
||||
const gop = try create_module.modules.getOrPut(arena, mod_name);
|
||||
|
||||
if (gop.found_existing) {
|
||||
fatal("unable to add module '{s}': already exists as '{s}'", .{
|
||||
mod_name, gop.value_ptr.paths.root_src_path,
|
||||
});
|
||||
}
|
||||
|
||||
// See duplicate logic: ModCreationGlobalFlags
|
||||
if (mod_opts.single_threaded == false)
|
||||
create_module.opts.any_non_single_threaded = true;
|
||||
if (mod_opts.sanitize_thread == true)
|
||||
create_module.opts.any_sanitize_thread = true;
|
||||
if (mod_opts.unwind_tables == true)
|
||||
create_module.opts.any_unwind_tables = true;
|
||||
if (mod_opts.strip == false)
|
||||
create_module.opts.any_non_stripped = true;
|
||||
if (mod_opts.error_tracing == true)
|
||||
create_module.opts.any_error_tracing = true;
|
||||
|
||||
gop.value_ptr.* = .{
|
||||
.paths = p: {
|
||||
if (opt_root_src_orig) |root_src_orig| {
|
||||
create_module.opts.have_zcu = true;
|
||||
const root_src = try introspect.resolvePath(arena, root_src_orig);
|
||||
break :p .{
|
||||
.root = .{
|
||||
.root_dir = Cache.Directory.cwd(),
|
||||
.sub_path = fs.path.dirname(root_src) orelse "",
|
||||
},
|
||||
.root_src_path = fs.path.basename(root_src),
|
||||
};
|
||||
}
|
||||
break :p .{
|
||||
.root = .{ .root_dir = Cache.Directory.cwd() },
|
||||
.root_src_path = "",
|
||||
};
|
||||
},
|
||||
.cc_argv = try cc_argv.toOwnedSlice(arena),
|
||||
.inherited = mod_opts.*,
|
||||
.target_arch_os_abi = target_arch_os_abi.*,
|
||||
.target_mcpu = target_mcpu.*,
|
||||
.deps = try deps.toOwnedSlice(arena),
|
||||
.resolved = null,
|
||||
.c_source_files_start = c_source_files_owner_index.*,
|
||||
.c_source_files_end = create_module.c_source_files.items.len,
|
||||
.rc_source_files_start = rc_source_files_owner_index.*,
|
||||
.rc_source_files_end = create_module.rc_source_files.items.len,
|
||||
};
|
||||
cssan.reset();
|
||||
mod_opts.* = .{};
|
||||
target_arch_os_abi.* = null;
|
||||
target_mcpu.* = null;
|
||||
c_source_files_owner_index.* = create_module.c_source_files.items.len;
|
||||
rc_source_files_owner_index.* = create_module.rc_source_files.items.len;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user