Skip to content

Commit 643ec8c

Browse files
author
Felix "xq" Queißner
committed
Rebase + two fixes.
1 parent d7aeadb commit 643ec8c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

test/link/macho/tbdv3/build.zig

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

0 commit comments

Comments
 (0)