authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-12-23 23:52:16-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-01-01 17:51:21-07:00
loge12e29630664a78a32103d56175162381443b574
treea2d8d6e295f8ce2eedd9d8d7c9b4165cf149fb79
parent3262e9cceee21279f1327e36bac1b5a9a7989cea

CLI: fix not respecting module remappings

1 files changed, 3 insertions(+), 3 deletions(-)

src/main.zig+3-3
...@@ -1059,7 +1059,7 @@ fn buildOutputType(...@@ -1059,7 +1059,7 @@ fn buildOutputType(
1059 create_module.opts.any_error_tracing = true;1059 create_module.opts.any_error_tracing = true;
10601060
1061 const root_src = try introspect.resolvePath(arena, root_src_orig);1061 const root_src = try introspect.resolvePath(arena, root_src_orig);
1062 try create_module.modules.put(arena, mod_name, .{1062 gop.value_ptr.* = .{
1063 .paths = .{1063 .paths = .{
1064 .root = .{1064 .root = .{
1065 .root_dir = Cache.Directory.cwd(),1065 .root_dir = Cache.Directory.cwd(),
...@@ -1077,7 +1077,7 @@ fn buildOutputType(...@@ -1077,7 +1077,7 @@ fn buildOutputType(
1077 .c_source_files_end = create_module.c_source_files.items.len,1077 .c_source_files_end = create_module.c_source_files.items.len,
1078 .rc_source_files_start = rc_source_files_owner_index,1078 .rc_source_files_start = rc_source_files_owner_index,
1079 .rc_source_files_end = create_module.rc_source_files.items.len,1079 .rc_source_files_end = create_module.rc_source_files.items.len,
1080 });1080 };
1081 cssan.reset();1081 cssan.reset();
1082 mod_opts = .{};1082 mod_opts = .{};
1083 target_arch_os_abi = null;1083 target_arch_os_abi = null;
...@@ -3882,7 +3882,7 @@ fn createModule(...@@ -3882,7 +3882,7 @@ fn createModule(
3882 for (create_module.rc_source_files.items[cli_mod.rc_source_files_start..cli_mod.rc_source_files_end]) |*item| item.owner = mod;3882 for (create_module.rc_source_files.items[cli_mod.rc_source_files_start..cli_mod.rc_source_files_end]) |*item| item.owner = mod;
38833883
3884 for (cli_mod.deps) |dep| {3884 for (cli_mod.deps) |dep| {
3885 const dep_index = create_module.modules.getIndex(dep.key) orelse3885 const dep_index = create_module.modules.getIndex(dep.value) orelse
3886 fatal("module '{s}' depends on non-existent module '{s}'", .{ name, dep.key });3886 fatal("module '{s}' depends on non-existent module '{s}'", .{ name, dep.key });
3887 const dep_mod = try createModule(gpa, arena, create_module, dep_index, mod, zig_lib_directory);3887 const dep_mod = try createModule(gpa, arena, create_module, dep_index, mod, zig_lib_directory);
3888 try mod.deps.put(arena, dep.key, dep_mod);3888 try mod.deps.put(arena, dep.key, dep_mod);