Merge pull request #15061 from ziglang/fix-15036

build: fix adding rpaths on darwin, improve CheckObjectStep to allow matching FileSource paths

1 files changed, 16 insertions, 0 deletions

diff --git a/lib/std/Build/CompileStep.zig b/lib/std/Build/CompileStep.zig
index 72855f360e..2747f56af2 100644
--- a/lib/std/Build/CompileStep.zig
+++ b/lib/std/Build/CompileStep.zig
@@ -1725,6 +1725,22 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
     try zig_args.ensureUnusedCapacity(2 * self.rpaths.items.len);
     for (self.rpaths.items) |rpath| {
         zig_args.appendAssumeCapacity("-rpath");
+
+        if (self.target_info.target.isDarwin()) switch (rpath) {
+            .path => |path| {
+                // On Darwin, we should not try to expand special runtime paths such as
+                // * @executable_path
+                // * @loader_path
+                if (mem.startsWith(u8, path, "@executable_path") or
+                    mem.startsWith(u8, path, "@loader_path"))
+                {
+                    zig_args.appendAssumeCapacity(path);
+                    continue;
+                }
+            },
+            .generated => {},
+        };
+
         zig_args.appendAssumeCapacity(rpath.getPath2(b, step));
     }