authorgravatar for xq@random-projects.netFelix "xq" Queißner <xq@random-projects.net> 2023-07-27 01:23:41+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-07-30 11:18:50-07:00
logae11fba44a61f4ccb81875633a4203116167509c
treebf9bdd160431f95833b68627a66efcec21a469d1
parent35d0a49db911e9c459902a021a5bfa05c97ca107

Rebase + two fixes.


2 files changed, 6 insertions(+), 5 deletions(-)

test/link/macho/tbdv3/build.zig+5-4
......@@ -23,8 +23,9 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
2323 .optimize = optimize,
2424 .target = target,
2525 });
26 lib.addCSourceFile("a.c", &.{});
26 lib.addCSourceFile(.{ .file = .{ .path = "a.c" }, .flags = &.{} });
2727 lib.linkLibC();
28 lib.forceEmit(.bin); // will be referenced by the tbd file
2829
2930 const tbd_file = b.addWriteFile("liba.tbd",
3031 \\--- !tapi-tbd-v3
......@@ -43,10 +44,10 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
4344 .optimize = optimize,
4445 .target = target,
4546 });
46 exe.addCSourceFile("main.c", &[0][]const u8{});
47 exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &[0][]const u8{} });
4748 exe.linkSystemLibrary("a");
48 exe.addLibraryPathDirectorySource(tbd_file.getDirectorySource());
49 exe.addRPathDirectorySource(lib.getOutputDirectorySource());
49 exe.addLibraryPath(tbd_file.getDirectory());
50 exe.addRPath(lib.getEmitDirectory());
5051 exe.linkLibC();
5152
5253 const run = b.addRunArtifact(exe);
test/standalone/coff_dwarf/build.zig+1-1
......@@ -23,7 +23,7 @@ pub fn build(b: *std.Build) void {
2323 .optimize = optimize,
2424 .target = target,
2525 });
26 lib.addCSourceFile(.{ .file = "shared_lib.c", .flags = &.{"-gdwarf"} });
26 lib.addCSourceFile(.{ .file = .{ .path = "shared_lib.c" }, .flags = &.{"-gdwarf"} });
2727 lib.linkLibC();
2828 exe.linkLibrary(lib);
2929