aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2023-12-23 23:52:16 -0700
committerAndrew Kelley <andrew@ziglang.org>2024-01-01 17:51:21 -0700
commite12e29630664a78a32103d56175162381443b574 (patch)
treea2d8d6e295f8ce2eedd9d8d7c9b4165cf149fb79 /src
parent3262e9cceee21279f1327e36bac1b5a9a7989cea (diff)
downloadzig-e12e29630664a78a32103d56175162381443b574.tar.gz
zig-e12e29630664a78a32103d56175162381443b574.zip
CLI: fix not respecting module remappings
Diffstat (limited to 'src')
-rw-r--r--src/main.zig6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.zig b/src/main.zig
index c165f724b8..4da79536e0 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -1059,7 +1059,7 @@ fn buildOutputType(
create_module.opts.any_error_tracing = true;
const root_src = try introspect.resolvePath(arena, root_src_orig);
- try create_module.modules.put(arena, mod_name, .{
+ gop.value_ptr.* = .{
.paths = .{
.root = .{
.root_dir = Cache.Directory.cwd(),
@@ -1077,7 +1077,7 @@ fn buildOutputType(
.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;
@@ -3882,7 +3882,7 @@ fn createModule(
for (create_module.rc_source_files.items[cli_mod.rc_source_files_start..cli_mod.rc_source_files_end]) |*item| item.owner = mod;
for (cli_mod.deps) |dep| {
- const dep_index = create_module.modules.getIndex(dep.key) orelse
+ const dep_index = create_module.modules.getIndex(dep.value) orelse
fatal("module '{s}' depends on non-existent module '{s}'", .{ name, dep.key });
const dep_mod = try createModule(gpa, arena, create_module, dep_index, mod, zig_lib_directory);
try mod.deps.put(arena, dep.key, dep_mod);