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...@@ -23,8 +23,9 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
23 .optimize = optimize,23 .optimize = optimize,
24 .target = target,24 .target = target,
25 });25 });
26 lib.addCSourceFile("a.c", &.{});26 lib.addCSourceFile(.{ .file = .{ .path = "a.c" }, .flags = &.{} });
27 lib.linkLibC();27 lib.linkLibC();
28 lib.forceEmit(.bin); // will be referenced by the tbd file
2829
29 const tbd_file = b.addWriteFile("liba.tbd",30 const tbd_file = b.addWriteFile("liba.tbd",
30 \\--- !tapi-tbd-v331 \\--- !tapi-tbd-v3
...@@ -43,10 +44,10 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize...@@ -43,10 +44,10 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
43 .optimize = optimize,44 .optimize = optimize,
44 .target = target,45 .target = target,
45 });46 });
46 exe.addCSourceFile("main.c", &[0][]const u8{});47 exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &[0][]const u8{} });
47 exe.linkSystemLibrary("a");48 exe.linkSystemLibrary("a");
48 exe.addLibraryPathDirectorySource(tbd_file.getDirectorySource());49 exe.addLibraryPath(tbd_file.getDirectory());
49 exe.addRPathDirectorySource(lib.getOutputDirectorySource());50 exe.addRPath(lib.getEmitDirectory());
50 exe.linkLibC();51 exe.linkLibC();
5152
52 const run = b.addRunArtifact(exe);53 const run = b.addRunArtifact(exe);
test/standalone/coff_dwarf/build.zig+1-1
...@@ -23,7 +23,7 @@ pub fn build(b: *std.Build) void {...@@ -23,7 +23,7 @@ pub fn build(b: *std.Build) void {
23 .optimize = optimize,23 .optimize = optimize,
24 .target = target,24 .target = target,
25 });25 });
26 lib.addCSourceFile(.{ .file = "shared_lib.c", .flags = &.{"-gdwarf"} });26 lib.addCSourceFile(.{ .file = .{ .path = "shared_lib.c" }, .flags = &.{"-gdwarf"} });
27 lib.linkLibC();27 lib.linkLibC();
28 exe.linkLibrary(lib);28 exe.linkLibrary(lib);
2929