From ae11fba44a61f4ccb81875633a4203116167509c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20=22xq=22=20Quei=C3=9Fner?= <git@random-projects.net>
Date: Thu, 27 Jul 2023 01:23:41 +0200
Subject: [PATCH] Rebase + two fixes.

---
 test/link/macho/tbdv3/build.zig      | 9 +++++----
 test/standalone/coff_dwarf/build.zig | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/link/macho/tbdv3/build.zig b/test/link/macho/tbdv3/build.zig
index c2eb6df626..3b27b5a0ca 100644
--- a/test/link/macho/tbdv3/build.zig
+++ b/test/link/macho/tbdv3/build.zig
@@ -23,8 +23,9 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
         .optimize = optimize,
         .target = target,
     });
-    lib.addCSourceFile("a.c", &.{});
+    lib.addCSourceFile(.{ .file = .{ .path = "a.c" }, .flags = &.{} });
     lib.linkLibC();
+    lib.forceEmit(.bin); // will be referenced by the tbd file
 
     const tbd_file = b.addWriteFile("liba.tbd",
         \\--- !tapi-tbd-v3
@@ -43,10 +44,10 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
         .optimize = optimize,
         .target = target,
     });
-    exe.addCSourceFile("main.c", &[0][]const u8{});
+    exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &[0][]const u8{} });
     exe.linkSystemLibrary("a");
-    exe.addLibraryPathDirectorySource(tbd_file.getDirectorySource());
-    exe.addRPathDirectorySource(lib.getOutputDirectorySource());
+    exe.addLibraryPath(tbd_file.getDirectory());
+    exe.addRPath(lib.getEmitDirectory());
     exe.linkLibC();
 
     const run = b.addRunArtifact(exe);
diff --git a/test/standalone/coff_dwarf/build.zig b/test/standalone/coff_dwarf/build.zig
index d4a2f2b65b..b85b44b686 100644
--- a/test/standalone/coff_dwarf/build.zig
+++ b/test/standalone/coff_dwarf/build.zig
@@ -23,7 +23,7 @@ pub fn build(b: *std.Build) void {
         .optimize = optimize,
         .target = target,
     });
-    lib.addCSourceFile(.{ .file = "shared_lib.c", .flags = &.{"-gdwarf"} });
+    lib.addCSourceFile(.{ .file = .{ .path = "shared_lib.c" }, .flags = &.{"-gdwarf"} });
     lib.linkLibC();
     exe.linkLibrary(lib);