From bda7f21f16e5ed017dc853e20fc79c3eb6f39647 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Wed, 24 Jun 2026 01:22:00 -0700
Subject: [PATCH] Maker: provide --dep import aliases on CLI

---
 lib/compiler/Maker.zig | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/lib/compiler/Maker.zig b/lib/compiler/Maker.zig
index fe27a158800a7988690c7611a27c0f00a52e01fa..35510c6f0be03815a3704f49b5de5bf030ccf0ef 100644
--- a/lib/compiler/Maker.zig
+++ b/lib/compiler/Maker.zig
@@ -116,9 +116,13 @@ pub const CliModule = struct {
 
     fn lower(cm: *const CliModule, arena: Allocator, gpa: Allocator, argv: *std.ArrayList([]const u8)) !void {
         try argv.ensureUnusedCapacity(gpa, 2 * cm.deps.count() + 1);
-        for (cm.deps.values()) |dep| {
+        for (cm.deps.keys(), cm.deps.values()) |name, dep| {
             argv.appendAssumeCapacity("--dep");
-            argv.appendAssumeCapacity(dep.name);
+            if (mem.eql(u8, name, dep.name)) {
+                argv.appendAssumeCapacity(dep.name);
+            } else {
+                argv.appendAssumeCapacity(try allocPrint(arena, "{s}={s}", .{ name, dep.name }));
+            }
         }
         argv.appendAssumeCapacity(try allocPrint(arena, "-M{s}={s}", .{ cm.name, cm.root_path }));
     }
@@ -922,12 +926,18 @@ pub fn main(init: process.Init.Minimal) !void {
                     build_configurer_argv.shrinkRetainingCapacity(argv_deps_index);
                     for (deps_mod.deps.values()) |dep| {
                         try build_configurer_argv.ensureUnusedCapacity(gpa, 2 * dep.deps.count() + 1);
-                        for (dep.deps.values()) |sub| {
+                        for (dep.deps.keys(), dep.deps.values()) |name, sub| {
                             build_configurer_argv.appendAssumeCapacity("--dep");
-                            build_configurer_argv.appendAssumeCapacity(sub.name);
+                            if (mem.eql(u8, name, sub.name)) {
+                                build_configurer_argv.appendAssumeCapacity(sub.name);
+                            } else {
+                                build_configurer_argv.appendAssumeCapacity(try allocPrint(arena, "{s}={s}", .{
+                                    name, sub.name,
+                                }));
+                            }
                         }
-                        build_configurer_argv.appendAssumeCapacity(try allocPrint(arena, "-M{s}={s}", .{
-                            dep.name, dep.root_path,
+                        build_configurer_argv.appendAssumeCapacity(try allocPrint(arena, "-M{s}={s}/{s}", .{
+                            dep.name, dep.root_path, std.zig.build_zig_basename,
                         }));
                     }
                     try deps_mod.lower(arena, gpa, &build_configurer_argv);
-- 
2.54.0