authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-04-11 23:35:51-07:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-04-11 23:35:51-07:00
log10ff81c26457ff02b7a7ed580aaf773297ad8025
tree1b303c864ace3e76ac716ab7ed23ddbddc3521f9
parent3bafc4400a40b497b3b3f8113f72c4b80969f13f
parent499a202a13c2a61f3cb2535c1bd63a9b6b30bfb7
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #19623 from ziglang/LazyPath

std.Build.LazyPath: upgrade API usages of source-relative path

68 files changed, 173 insertions(+), 203 deletions(-)

build.zig+13-13
...@@ -34,7 +34,7 @@ pub fn build(b: *std.Build) !void {...@@ -34,7 +34,7 @@ pub fn build(b: *std.Build) !void {
3434
35 const docgen_exe = b.addExecutable(.{35 const docgen_exe = b.addExecutable(.{
36 .name = "docgen",36 .name = "docgen",
37 .root_source_file = .{ .path = "tools/docgen.zig" },37 .root_source_file = b.path("tools/docgen.zig"),
38 .target = b.host,38 .target = b.host,
39 .optimize = .Debug,39 .optimize = .Debug,
40 .single_threaded = single_threaded,40 .single_threaded = single_threaded,
...@@ -46,7 +46,7 @@ pub fn build(b: *std.Build) !void {...@@ -46,7 +46,7 @@ pub fn build(b: *std.Build) !void {
46 docgen_cmd.addArg("--zig-lib-dir");46 docgen_cmd.addArg("--zig-lib-dir");
47 docgen_cmd.addDirectoryArg(p);47 docgen_cmd.addDirectoryArg(p);
48 }48 }
49 docgen_cmd.addFileArg(.{ .path = "doc/langref.html.in" });49 docgen_cmd.addFileArg(b.path("doc/langref.html.in"));
50 const langref_file = docgen_cmd.addOutputFileArg("langref.html");50 const langref_file = docgen_cmd.addOutputFileArg("langref.html");
51 const install_langref = b.addInstallFileWithDir(langref_file, .prefix, "doc/langref.html");51 const install_langref = b.addInstallFileWithDir(langref_file, .prefix, "doc/langref.html");
52 if (!skip_install_langref) {52 if (!skip_install_langref) {
...@@ -55,9 +55,9 @@ pub fn build(b: *std.Build) !void {...@@ -55,9 +55,9 @@ pub fn build(b: *std.Build) !void {
5555
56 const autodoc_test = b.addObject(.{56 const autodoc_test = b.addObject(.{
57 .name = "std",57 .name = "std",
58 .root_source_file = .{ .path = "lib/std/std.zig" },58 .root_source_file = b.path("lib/std/std.zig"),
59 .target = target,59 .target = target,
60 .zig_lib_dir = .{ .path = "lib" },60 .zig_lib_dir = b.path("lib"),
61 .optimize = .Debug,61 .optimize = .Debug,
62 });62 });
63 const install_std_docs = b.addInstallDirectory(.{63 const install_std_docs = b.addInstallDirectory(.{
...@@ -86,7 +86,7 @@ pub fn build(b: *std.Build) !void {...@@ -86,7 +86,7 @@ pub fn build(b: *std.Build) !void {
8686
87 const check_case_exe = b.addExecutable(.{87 const check_case_exe = b.addExecutable(.{
88 .name = "check-case",88 .name = "check-case",
89 .root_source_file = .{ .path = "test/src/Cases.zig" },89 .root_source_file = b.path("test/src/Cases.zig"),
90 .target = b.host,90 .target = b.host,
91 .optimize = optimize,91 .optimize = optimize,
92 .single_threaded = single_threaded,92 .single_threaded = single_threaded,
...@@ -135,7 +135,7 @@ pub fn build(b: *std.Build) !void {...@@ -135,7 +135,7 @@ pub fn build(b: *std.Build) !void {
135135
136 if (!skip_install_lib_files) {136 if (!skip_install_lib_files) {
137 b.installDirectory(.{137 b.installDirectory(.{
138 .source_dir = .{ .path = "lib" },138 .source_dir = b.path("lib"),
139 .install_dir = if (flat) .prefix else .lib,139 .install_dir = if (flat) .prefix else .lib,
140 .install_subdir = if (flat) "lib" else "zig",140 .install_subdir = if (flat) "lib" else "zig",
141 .exclude_extensions = &[_][]const u8{141 .exclude_extensions = &[_][]const u8{
...@@ -552,10 +552,10 @@ pub fn build(b: *std.Build) !void {...@@ -552,10 +552,10 @@ pub fn build(b: *std.Build) !void {
552 const update_mingw_exe = b.addExecutable(.{552 const update_mingw_exe = b.addExecutable(.{
553 .name = "update_mingw",553 .name = "update_mingw",
554 .target = b.host,554 .target = b.host,
555 .root_source_file = .{ .path = "tools/update_mingw.zig" },555 .root_source_file = b.path("tools/update_mingw.zig"),
556 });556 });
557 const update_mingw_run = b.addRunArtifact(update_mingw_exe);557 const update_mingw_run = b.addRunArtifact(update_mingw_exe);
558 update_mingw_run.addDirectoryArg(.{ .path = "lib" });558 update_mingw_run.addDirectoryArg(b.path("lib"));
559 if (opt_mingw_src_path) |mingw_src_path| {559 if (opt_mingw_src_path) |mingw_src_path| {
560 update_mingw_run.addDirectoryArg(.{ .cwd_relative = mingw_src_path });560 update_mingw_run.addDirectoryArg(.{ .cwd_relative = mingw_src_path });
561 } else {561 } else {
...@@ -606,10 +606,10 @@ fn addWasiUpdateStep(b: *std.Build, version: [:0]const u8) !void {...@@ -606,10 +606,10 @@ fn addWasiUpdateStep(b: *std.Build, version: [:0]const u8) !void {
606 });606 });
607 run_opt.addArtifactArg(exe);607 run_opt.addArtifactArg(exe);
608 run_opt.addArg("-o");608 run_opt.addArg("-o");
609 run_opt.addFileArg(.{ .path = "stage1/zig1.wasm" });609 run_opt.addFileArg(b.path("stage1/zig1.wasm"));
610610
611 const copy_zig_h = b.addWriteFiles();611 const copy_zig_h = b.addWriteFiles();
612 copy_zig_h.addCopyFileToSource(.{ .path = "lib/zig.h" }, "stage1/zig.h");612 copy_zig_h.addCopyFileToSource(b.path("lib/zig.h"), "stage1/zig.h");
613613
614 const update_zig1_step = b.step("update-zig1", "Update stage1/zig1.wasm");614 const update_zig1_step = b.step("update-zig1", "Update stage1/zig1.wasm");
615 update_zig1_step.dependOn(&run_opt.step);615 update_zig1_step.dependOn(&run_opt.step);
...@@ -627,7 +627,7 @@ const AddCompilerStepOptions = struct {...@@ -627,7 +627,7 @@ const AddCompilerStepOptions = struct {
627fn addCompilerStep(b: *std.Build, options: AddCompilerStepOptions) *std.Build.Step.Compile {627fn addCompilerStep(b: *std.Build, options: AddCompilerStepOptions) *std.Build.Step.Compile {
628 const exe = b.addExecutable(.{628 const exe = b.addExecutable(.{
629 .name = "zig",629 .name = "zig",
630 .root_source_file = .{ .path = "src/main.zig" },630 .root_source_file = b.path("src/main.zig"),
631 .target = options.target,631 .target = options.target,
632 .optimize = options.optimize,632 .optimize = options.optimize,
633 .max_rss = 7_000_000_000,633 .max_rss = 7_000_000_000,
...@@ -638,11 +638,11 @@ fn addCompilerStep(b: *std.Build, options: AddCompilerStepOptions) *std.Build.St...@@ -638,11 +638,11 @@ fn addCompilerStep(b: *std.Build, options: AddCompilerStepOptions) *std.Build.St
638 exe.stack_size = stack_size;638 exe.stack_size = stack_size;
639639
640 const aro_module = b.createModule(.{640 const aro_module = b.createModule(.{
641 .root_source_file = .{ .path = "lib/compiler/aro/aro.zig" },641 .root_source_file = b.path("lib/compiler/aro/aro.zig"),
642 });642 });
643643
644 const aro_translate_c_module = b.createModule(.{644 const aro_translate_c_module = b.createModule(.{
645 .root_source_file = .{ .path = "lib/compiler/aro_translate_c.zig" },645 .root_source_file = b.path("lib/compiler/aro_translate_c.zig"),
646 .imports = &.{646 .imports = &.{
647 .{647 .{
648 .name = "aro",648 .name = "aro",
lib/std/Build.zig+18-11
...@@ -1546,22 +1546,22 @@ pub fn addInstallArtifact(...@@ -1546,22 +1546,22 @@ pub fn addInstallArtifact(
1546}1546}
15471547
1548///`dest_rel_path` is relative to prefix path1548///`dest_rel_path` is relative to prefix path
1549pub fn installFile(self: *Build, src_path: []const u8, dest_rel_path: []const u8) void {1549pub fn installFile(b: *Build, src_path: []const u8, dest_rel_path: []const u8) void {
1550 self.getInstallStep().dependOn(&self.addInstallFileWithDir(.{ .path = src_path }, .prefix, dest_rel_path).step);1550 b.getInstallStep().dependOn(&b.addInstallFileWithDir(b.path(src_path), .prefix, dest_rel_path).step);
1551}1551}
15521552
1553pub fn installDirectory(self: *Build, options: Step.InstallDir.Options) void {1553pub fn installDirectory(b: *Build, options: Step.InstallDir.Options) void {
1554 self.getInstallStep().dependOn(&self.addInstallDirectory(options).step);1554 b.getInstallStep().dependOn(&b.addInstallDirectory(options).step);
1555}1555}
15561556
1557///`dest_rel_path` is relative to bin path1557///`dest_rel_path` is relative to bin path
1558pub fn installBinFile(self: *Build, src_path: []const u8, dest_rel_path: []const u8) void {1558pub fn installBinFile(b: *Build, src_path: []const u8, dest_rel_path: []const u8) void {
1559 self.getInstallStep().dependOn(&self.addInstallFileWithDir(.{ .path = src_path }, .bin, dest_rel_path).step);1559 b.getInstallStep().dependOn(&b.addInstallFileWithDir(b.path(src_path), .bin, dest_rel_path).step);
1560}1560}
15611561
1562///`dest_rel_path` is relative to lib path1562///`dest_rel_path` is relative to lib path
1563pub fn installLibFile(self: *Build, src_path: []const u8, dest_rel_path: []const u8) void {1563pub fn installLibFile(b: *Build, src_path: []const u8, dest_rel_path: []const u8) void {
1564 self.getInstallStep().dependOn(&self.addInstallFileWithDir(.{ .path = src_path }, .lib, dest_rel_path).step);1564 b.getInstallStep().dependOn(&b.addInstallFileWithDir(b.path(src_path), .lib, dest_rel_path).step);
1565}1565}
15661566
1567pub fn addObjCopy(b: *Build, source: LazyPath, options: Step.ObjCopy.Options) *Step.ObjCopy {1567pub fn addObjCopy(b: *Build, source: LazyPath, options: Step.ObjCopy.Options) *Step.ObjCopy {
...@@ -1637,7 +1637,11 @@ pub fn truncateFile(self: *Build, dest_path: []const u8) !void {...@@ -1637,7 +1637,11 @@ pub fn truncateFile(self: *Build, dest_path: []const u8) !void {
16371637
1638/// References a file or directory relative to the source root.1638/// References a file or directory relative to the source root.
1639pub fn path(b: *Build, sub_path: []const u8) LazyPath {1639pub fn path(b: *Build, sub_path: []const u8) LazyPath {
1640 assert(!fs.path.isAbsolute(sub_path));1640 if (fs.path.isAbsolute(sub_path)) {
1641 std.debug.panic("sub_path is expected to be relative to the build root, but was this absolute path: '{s}'. It is best avoid absolute paths, but if you must, it is supported by LazyPath.cwd_relative", .{
1642 sub_path,
1643 });
1644 }
1641 return .{ .src_path = .{1645 return .{ .src_path = .{
1642 .owner = b,1646 .owner = b,
1643 .sub_path = sub_path,1647 .sub_path = sub_path,
...@@ -2315,12 +2319,15 @@ pub const LazyPath = union(enum) {...@@ -2315,12 +2319,15 @@ pub const LazyPath = union(enum) {
2315 }2319 }
2316 }2320 }
23172321
2318 /// Duplicates the file source for a given builder.2322 /// Copies the internal strings.
2323 ///
2324 /// The `b` parameter is only used for its allocator. All *Build instances
2325 /// share the same allocator.
2319 pub fn dupe(self: LazyPath, b: *Build) LazyPath {2326 pub fn dupe(self: LazyPath, b: *Build) LazyPath {
2320 return switch (self) {2327 return switch (self) {
2321 .src_path => |sp| .{ .src_path = .{2328 .src_path => |sp| .{ .src_path = .{
2322 .owner = sp.owner,2329 .owner = sp.owner,
2323 .sub_path = b.dupePath(sp.sub_path),2330 .sub_path = sp.owner.dupePath(sp.sub_path),
2324 } },2331 } },
2325 .path => |p| .{ .path = b.dupePath(p) },2332 .path => |p| .{ .path = b.dupePath(p) },
2326 .cwd_relative => |p| .{ .cwd_relative = b.dupePath(p) },2333 .cwd_relative => |p| .{ .cwd_relative = b.dupePath(p) },
lib/std/Build/Module.zig+2-13
...@@ -451,7 +451,7 @@ pub fn linkFramework(m: *Module, name: []const u8, options: LinkFrameworkOptions...@@ -451,7 +451,7 @@ pub fn linkFramework(m: *Module, name: []const u8, options: LinkFrameworkOptions
451pub const AddCSourceFilesOptions = struct {451pub const AddCSourceFilesOptions = struct {
452 /// When provided, `files` are relative to `root` rather than the452 /// When provided, `files` are relative to `root` rather than the
453 /// package that owns the `Compile` step.453 /// package that owns the `Compile` step.
454 root: LazyPath = .{ .path = "" },454 root: ?LazyPath = null,
455 files: []const []const u8,455 files: []const []const u8,
456 flags: []const []const u8 = &.{},456 flags: []const []const u8 = &.{},
457};457};
...@@ -472,7 +472,7 @@ pub fn addCSourceFiles(m: *Module, options: AddCSourceFilesOptions) void {...@@ -472,7 +472,7 @@ pub fn addCSourceFiles(m: *Module, options: AddCSourceFilesOptions) void {
472472
473 const c_source_files = allocator.create(CSourceFiles) catch @panic("OOM");473 const c_source_files = allocator.create(CSourceFiles) catch @panic("OOM");
474 c_source_files.* = .{474 c_source_files.* = .{
475 .root = options.root,475 .root = options.root orelse b.path(""),
476 .files = b.dupeStrings(options.files),476 .files = b.dupeStrings(options.files),
477 .flags = b.dupeStrings(options.flags),477 .flags = b.dupeStrings(options.flags),
478 };478 };
...@@ -573,17 +573,6 @@ pub fn addLibraryPath(m: *Module, directory_path: LazyPath) void {...@@ -573,17 +573,6 @@ pub fn addLibraryPath(m: *Module, directory_path: LazyPath) void {
573573
574pub fn addRPath(m: *Module, directory_path: LazyPath) void {574pub fn addRPath(m: *Module, directory_path: LazyPath) void {
575 const b = m.owner;575 const b = m.owner;
576 switch (directory_path) {
577 .path, .cwd_relative => |path| {
578 // TODO: remove this check after people upgrade and stop expecting it to work
579 if (std.mem.startsWith(u8, path, "@executable_path") or
580 std.mem.startsWith(u8, path, "@loader_path"))
581 {
582 @panic("this function is for adding directory paths. It does not support special rpaths. use addRPathSpecial for that.");
583 }
584 },
585 else => {},
586 }
587 m.rpaths.append(b.allocator, .{ .lazy_path = directory_path.dupe(b) }) catch @panic("OOM");576 m.rpaths.append(b.allocator, .{ .lazy_path = directory_path.dupe(b) }) catch @panic("OOM");
588 addLazyPathDependenciesOnly(m, directory_path);577 addLazyPathDependenciesOnly(m, directory_path);
589}578}
lib/std/Build/Step/Compile.zig+2-26
...@@ -264,20 +264,8 @@ pub const HeaderInstallation = union(enum) {...@@ -264,20 +264,8 @@ pub const HeaderInstallation = union(enum) {
264 dest_rel_path: []const u8,264 dest_rel_path: []const u8,
265265
266 pub fn dupe(self: File, b: *std.Build) File {266 pub fn dupe(self: File, b: *std.Build) File {
267 // 'path' lazy paths are relative to the build root of some step, inferred from the step
268 // in which they are used. This means that we can't dupe such paths, because they may
269 // come from dependencies with their own build roots and duping the paths as is might
270 // cause the build script to search for the file relative to the wrong root.
271 // As a temporary workaround, we convert build root-relative paths to absolute paths.
272 // If/when the build-root relative paths are updated to encode which build root they are
273 // relative to, this workaround should be removed.
274 const duped_source: LazyPath = switch (self.source) {
275 .path => |root_rel| .{ .cwd_relative = b.pathFromRoot(root_rel) },
276 else => self.source.dupe(b),
277 };
278
279 return .{267 return .{
280 .source = duped_source,268 .source = self.source.dupe(b),
281 .dest_rel_path = b.dupePath(self.dest_rel_path),269 .dest_rel_path = b.dupePath(self.dest_rel_path),
282 };270 };
283 }271 }
...@@ -305,20 +293,8 @@ pub const HeaderInstallation = union(enum) {...@@ -305,20 +293,8 @@ pub const HeaderInstallation = union(enum) {
305 };293 };
306294
307 pub fn dupe(self: Directory, b: *std.Build) Directory {295 pub fn dupe(self: Directory, b: *std.Build) Directory {
308 // 'path' lazy paths are relative to the build root of some step, inferred from the step
309 // in which they are used. This means that we can't dupe such paths, because they may
310 // come from dependencies with their own build roots and duping the paths as is might
311 // cause the build script to search for the file relative to the wrong root.
312 // As a temporary workaround, we convert build root-relative paths to absolute paths.
313 // If/when the build-root relative paths are updated to encode which build root they are
314 // relative to, this workaround should be removed.
315 const duped_source: LazyPath = switch (self.source) {
316 .path => |root_rel| .{ .cwd_relative = b.pathFromRoot(root_rel) },
317 else => self.source.dupe(b),
318 };
319
320 return .{296 return .{
321 .source = duped_source,297 .source = self.source.dupe(b),
322 .dest_rel_path = b.dupePath(self.dest_rel_path),298 .dest_rel_path = b.dupePath(self.dest_rel_path),
323 .options = self.options.dupe(b),299 .options = self.options.dupe(b),
324 };300 };
test/link/bss/build.zig+1-1
...@@ -6,7 +6,7 @@ pub fn build(b: *std.Build) void {...@@ -6,7 +6,7 @@ pub fn build(b: *std.Build) void {
66
7 const exe = b.addExecutable(.{7 const exe = b.addExecutable(.{
8 .name = "bss",8 .name = "bss",
9 .root_source_file = .{ .path = "main.zig" },9 .root_source_file = b.path("main.zig"),
10 .target = b.host,10 .target = b.host,
11 .optimize = .Debug,11 .optimize = .Debug,
12 });12 });
test/link/common_symbols/build.zig+1-1
...@@ -22,7 +22,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize...@@ -22,7 +22,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
22 });22 });
2323
24 const test_exe = b.addTest(.{24 const test_exe = b.addTest(.{
25 .root_source_file = .{ .path = "main.zig" },25 .root_source_file = b.path("main.zig"),
26 .optimize = optimize,26 .optimize = optimize,
27 });27 });
28 test_exe.linkLibrary(lib_a);28 test_exe.linkLibrary(lib_a);
test/link/common_symbols_alignment/build.zig+1-1
...@@ -22,7 +22,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize...@@ -22,7 +22,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
22 });22 });
2323
24 const test_exe = b.addTest(.{24 const test_exe = b.addTest(.{
25 .root_source_file = .{ .path = "main.zig" },25 .root_source_file = b.path("main.zig"),
26 .optimize = optimize,26 .optimize = optimize,
27 });27 });
28 test_exe.linkLibrary(lib_a);28 test_exe.linkLibrary(lib_a);
test/link/glibc_compat/build.zig+2-2
...@@ -21,7 +21,7 @@ pub fn build(b: *std.Build) void {...@@ -21,7 +21,7 @@ pub fn build(b: *std.Build) void {
21 .{ .arch_os_abi = t },21 .{ .arch_os_abi = t },
22 ) catch unreachable),22 ) catch unreachable),
23 });23 });
24 exe.addCSourceFile(.{ .file = .{ .path = "main.c" } });24 exe.addCSourceFile(.{ .file = b.path("main.c") });
25 exe.linkLibC();25 exe.linkLibC();
26 // TODO: actually test the output26 // TODO: actually test the output
27 _ = exe.getEmittedBin();27 _ = exe.getEmittedBin();
...@@ -45,7 +45,7 @@ pub fn build(b: *std.Build) void {...@@ -45,7 +45,7 @@ pub fn build(b: *std.Build) void {
4545
46 const exe = b.addExecutable(.{46 const exe = b.addExecutable(.{
47 .name = t,47 .name = t,
48 .root_source_file = .{ .path = "glibc_runtime_check.zig" },48 .root_source_file = b.path("glibc_runtime_check.zig"),
49 .target = target,49 .target = target,
50 });50 });
51 exe.linkLibC();51 exe.linkLibC();
test/link/interdependent_static_c_libs/build.zig+6-6
...@@ -16,24 +16,24 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize...@@ -16,24 +16,24 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
16 .optimize = optimize,16 .optimize = optimize,
17 .target = b.host,17 .target = b.host,
18 });18 });
19 lib_a.addCSourceFile(.{ .file = .{ .path = "a.c" }, .flags = &[_][]const u8{} });19 lib_a.addCSourceFile(.{ .file = b.path("a.c"), .flags = &[_][]const u8{} });
20 lib_a.addIncludePath(.{ .path = "." });20 lib_a.addIncludePath(b.path("."));
2121
22 const lib_b = b.addStaticLibrary(.{22 const lib_b = b.addStaticLibrary(.{
23 .name = "b",23 .name = "b",
24 .optimize = optimize,24 .optimize = optimize,
25 .target = b.host,25 .target = b.host,
26 });26 });
27 lib_b.addCSourceFile(.{ .file = .{ .path = "b.c" }, .flags = &[_][]const u8{} });27 lib_b.addCSourceFile(.{ .file = b.path("b.c"), .flags = &[_][]const u8{} });
28 lib_b.addIncludePath(.{ .path = "." });28 lib_b.addIncludePath(b.path("."));
2929
30 const test_exe = b.addTest(.{30 const test_exe = b.addTest(.{
31 .root_source_file = .{ .path = "main.zig" },31 .root_source_file = b.path("main.zig"),
32 .optimize = optimize,32 .optimize = optimize,
33 });33 });
34 test_exe.linkLibrary(lib_a);34 test_exe.linkLibrary(lib_a);
35 test_exe.linkLibrary(lib_b);35 test_exe.linkLibrary(lib_b);
36 test_exe.addIncludePath(.{ .path = "." });36 test_exe.addIncludePath(b.path("."));
3737
38 test_step.dependOn(&b.addRunArtifact(test_exe).step);38 test_step.dependOn(&b.addRunArtifact(test_exe).step);
39}39}
test/link/macho.zig+3-3
...@@ -836,9 +836,9 @@ fn testLinkDirectlyCppTbd(b: *Build, opts: Options) *Step {...@@ -836,9 +836,9 @@ fn testLinkDirectlyCppTbd(b: *Build, opts: Options) *Step {
836 ,836 ,
837 .cpp_source_flags = &.{ "-nostdlib++", "-nostdinc++" },837 .cpp_source_flags = &.{ "-nostdlib++", "-nostdinc++" },
838 });838 });
839 exe.root_module.addSystemIncludePath(.{ .path = b.pathJoin(&.{ sdk, "/usr/include" }) });839 exe.root_module.addSystemIncludePath(b.path(b.pathJoin(&.{ sdk, "/usr/include" })));
840 exe.root_module.addIncludePath(.{ .path = b.pathJoin(&.{ sdk, "/usr/include/c++/v1" }) });840 exe.root_module.addIncludePath(b.path(b.pathJoin(&.{ sdk, "/usr/include/c++/v1" })));
841 exe.root_module.addObjectFile(.{ .path = b.pathJoin(&.{ sdk, "/usr/lib/libc++.tbd" }) });841 exe.root_module.addObjectFile(b.path(b.pathJoin(&.{ sdk, "/usr/lib/libc++.tbd" })));
842842
843 const check = exe.checkObject();843 const check = exe.checkObject();
844 check.checkInSymtab();844 check.checkInSymtab();
test/link/static_libs_from_object_files/build.zig+3-3
...@@ -57,7 +57,7 @@ fn add(b: *Build, test_step: *Step, files: []const LazyPath, optimize: std.built...@@ -57,7 +57,7 @@ fn add(b: *Build, test_step: *Step, files: []const LazyPath, optimize: std.built
57 {57 {
58 const exe = b.addExecutable(.{58 const exe = b.addExecutable(.{
59 .name = "test1",59 .name = "test1",
60 .root_source_file = .{ .path = "main.zig" },60 .root_source_file = b.path("main.zig"),
61 .optimize = optimize,61 .optimize = optimize,
62 .target = b.host,62 .target = b.host,
63 });63 });
...@@ -93,7 +93,7 @@ fn add(b: *Build, test_step: *Step, files: []const LazyPath, optimize: std.built...@@ -93,7 +93,7 @@ fn add(b: *Build, test_step: *Step, files: []const LazyPath, optimize: std.built
9393
94 const exe = b.addExecutable(.{94 const exe = b.addExecutable(.{
95 .name = "test2",95 .name = "test2",
96 .root_source_file = .{ .path = "main.zig" },96 .root_source_file = b.path("main.zig"),
97 .target = b.host,97 .target = b.host,
98 .optimize = optimize,98 .optimize = optimize,
99 });99 });
...@@ -134,7 +134,7 @@ fn add(b: *Build, test_step: *Step, files: []const LazyPath, optimize: std.built...@@ -134,7 +134,7 @@ fn add(b: *Build, test_step: *Step, files: []const LazyPath, optimize: std.built
134134
135 const exe = b.addExecutable(.{135 const exe = b.addExecutable(.{
136 .name = "test3",136 .name = "test3",
137 .root_source_file = .{ .path = "main.zig" },137 .root_source_file = b.path("main.zig"),
138 .target = b.host,138 .target = b.host,
139 .optimize = optimize,139 .optimize = optimize,
140 });140 });
test/link/wasm/archive/build.zig+1-1
...@@ -17,7 +17,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize...@@ -17,7 +17,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
17 // and therefore link with its archive file.17 // and therefore link with its archive file.
18 const lib = b.addExecutable(.{18 const lib = b.addExecutable(.{
19 .name = "main",19 .name = "main",
20 .root_source_file = .{ .path = "main.zig" },20 .root_source_file = b.path("main.zig"),
21 .optimize = optimize,21 .optimize = optimize,
22 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),22 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
23 .strip = false,23 .strip = false,
test/link/wasm/basic-features/build.zig+1-1
...@@ -6,7 +6,7 @@ pub fn build(b: *std.Build) void {...@@ -6,7 +6,7 @@ pub fn build(b: *std.Build) void {
6 // Library with explicitly set cpu features6 // Library with explicitly set cpu features
7 const lib = b.addExecutable(.{7 const lib = b.addExecutable(.{
8 .name = "lib",8 .name = "lib",
9 .root_source_file = .{ .path = "main.zig" },9 .root_source_file = b.path("main.zig"),
10 .optimize = .Debug,10 .optimize = .Debug,
11 .target = b.resolveTargetQuery(.{11 .target = b.resolveTargetQuery(.{
12 .cpu_arch = .wasm32,12 .cpu_arch = .wasm32,
test/link/wasm/bss/build.zig+2-2
...@@ -16,7 +16,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize_mode: std.builtin.Opt...@@ -16,7 +16,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize_mode: std.builtin.Opt
16 {16 {
17 const lib = b.addExecutable(.{17 const lib = b.addExecutable(.{
18 .name = "lib",18 .name = "lib",
19 .root_source_file = .{ .path = "lib.zig" },19 .root_source_file = b.path("lib.zig"),
20 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),20 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
21 .optimize = optimize_mode,21 .optimize = optimize_mode,
22 .strip = false,22 .strip = false,
...@@ -64,7 +64,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize_mode: std.builtin.Opt...@@ -64,7 +64,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize_mode: std.builtin.Opt
64 {64 {
65 const lib = b.addExecutable(.{65 const lib = b.addExecutable(.{
66 .name = "lib",66 .name = "lib",
67 .root_source_file = .{ .path = "lib2.zig" },67 .root_source_file = b.path("lib2.zig"),
68 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),68 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
69 .optimize = optimize_mode,69 .optimize = optimize_mode,
70 .strip = false,70 .strip = false,
test/link/wasm/export-data/build.zig+1-1
...@@ -11,7 +11,7 @@ pub fn build(b: *std.Build) void {...@@ -11,7 +11,7 @@ pub fn build(b: *std.Build) void {
1111
12 const lib = b.addExecutable(.{12 const lib = b.addExecutable(.{
13 .name = "lib",13 .name = "lib",
14 .root_source_file = .{ .path = "lib.zig" },14 .root_source_file = b.path("lib.zig"),
15 .optimize = .ReleaseSafe, // to make the output deterministic in address positions15 .optimize = .ReleaseSafe, // to make the output deterministic in address positions
16 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),16 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
17 });17 });
test/link/wasm/export/build.zig+3-3
...@@ -15,7 +15,7 @@ pub fn build(b: *std.Build) void {...@@ -15,7 +15,7 @@ pub fn build(b: *std.Build) void {
15fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {15fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {
16 const no_export = b.addExecutable(.{16 const no_export = b.addExecutable(.{
17 .name = "no-export",17 .name = "no-export",
18 .root_source_file = .{ .path = "main.zig" },18 .root_source_file = b.path("main.zig"),
19 .optimize = optimize,19 .optimize = optimize,
20 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),20 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
21 });21 });
...@@ -25,7 +25,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize...@@ -25,7 +25,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
2525
26 const dynamic_export = b.addExecutable(.{26 const dynamic_export = b.addExecutable(.{
27 .name = "dynamic",27 .name = "dynamic",
28 .root_source_file = .{ .path = "main.zig" },28 .root_source_file = b.path("main.zig"),
29 .optimize = optimize,29 .optimize = optimize,
30 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),30 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
31 });31 });
...@@ -36,7 +36,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize...@@ -36,7 +36,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
3636
37 const force_export = b.addExecutable(.{37 const force_export = b.addExecutable(.{
38 .name = "force",38 .name = "force",
39 .root_source_file = .{ .path = "main.zig" },39 .root_source_file = b.path("main.zig"),
40 .optimize = optimize,40 .optimize = optimize,
41 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),41 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
42 });42 });
test/link/wasm/extern-mangle/build.zig+1-1
...@@ -13,7 +13,7 @@ pub fn build(b: *std.Build) void {...@@ -13,7 +13,7 @@ pub fn build(b: *std.Build) void {
13fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {13fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {
14 const lib = b.addExecutable(.{14 const lib = b.addExecutable(.{
15 .name = "lib",15 .name = "lib",
16 .root_source_file = .{ .path = "lib.zig" },16 .root_source_file = b.path("lib.zig"),
17 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),17 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
18 .optimize = optimize,18 .optimize = optimize,
19 });19 });
test/link/wasm/extern/build.zig+2-2
...@@ -15,11 +15,11 @@ pub fn build(b: *std.Build) void {...@@ -15,11 +15,11 @@ pub fn build(b: *std.Build) void {
15fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {15fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {
16 const exe = b.addExecutable(.{16 const exe = b.addExecutable(.{
17 .name = "extern",17 .name = "extern",
18 .root_source_file = .{ .path = "main.zig" },18 .root_source_file = b.path("main.zig"),
19 .optimize = optimize,19 .optimize = optimize,
20 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .wasi }),20 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .wasi }),
21 });21 });
22 exe.addCSourceFile(.{ .file = .{ .path = "foo.c" }, .flags = &.{} });22 exe.addCSourceFile(.{ .file = b.path("foo.c"), .flags = &.{} });
23 exe.use_llvm = false;23 exe.use_llvm = false;
24 exe.use_lld = false;24 exe.use_lld = false;
2525
test/link/wasm/function-table/build.zig+3-3
...@@ -15,7 +15,7 @@ pub fn build(b: *std.Build) void {...@@ -15,7 +15,7 @@ pub fn build(b: *std.Build) void {
15fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {15fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {
16 const import_table = b.addExecutable(.{16 const import_table = b.addExecutable(.{
17 .name = "import_table",17 .name = "import_table",
18 .root_source_file = .{ .path = "lib.zig" },18 .root_source_file = b.path("lib.zig"),
19 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),19 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
20 .optimize = optimize,20 .optimize = optimize,
21 });21 });
...@@ -27,7 +27,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize...@@ -27,7 +27,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
2727
28 const export_table = b.addExecutable(.{28 const export_table = b.addExecutable(.{
29 .name = "export_table",29 .name = "export_table",
30 .root_source_file = .{ .path = "lib.zig" },30 .root_source_file = b.path("lib.zig"),
31 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),31 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
32 .optimize = optimize,32 .optimize = optimize,
33 });33 });
...@@ -39,7 +39,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize...@@ -39,7 +39,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
3939
40 const regular_table = b.addExecutable(.{40 const regular_table = b.addExecutable(.{
41 .name = "regular_table",41 .name = "regular_table",
42 .root_source_file = .{ .path = "lib.zig" },42 .root_source_file = b.path("lib.zig"),
43 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),43 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
44 .optimize = optimize,44 .optimize = optimize,
45 });45 });
test/link/wasm/infer-features/build.zig+2-2
...@@ -13,13 +13,13 @@ pub fn build(b: *std.Build) void {...@@ -13,13 +13,13 @@ pub fn build(b: *std.Build) void {
13 .os_tag = .freestanding,13 .os_tag = .freestanding,
14 }),14 }),
15 });15 });
16 c_obj.addCSourceFile(.{ .file = .{ .path = "foo.c" }, .flags = &.{} });16 c_obj.addCSourceFile(.{ .file = b.path("foo.c"), .flags = &.{} });
1717
18 // Wasm library that doesn't have any features specified. This will18 // Wasm library that doesn't have any features specified. This will
19 // infer its featureset from other linked object files.19 // infer its featureset from other linked object files.
20 const lib = b.addExecutable(.{20 const lib = b.addExecutable(.{
21 .name = "lib",21 .name = "lib",
22 .root_source_file = .{ .path = "main.zig" },22 .root_source_file = b.path("main.zig"),
23 .optimize = .Debug,23 .optimize = .Debug,
24 .target = b.resolveTargetQuery(.{24 .target = b.resolveTargetQuery(.{
25 .cpu_arch = .wasm32,25 .cpu_arch = .wasm32,
test/link/wasm/producers/build.zig+1-1
...@@ -16,7 +16,7 @@ pub fn build(b: *std.Build) void {...@@ -16,7 +16,7 @@ pub fn build(b: *std.Build) void {
16fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {16fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {
17 const lib = b.addExecutable(.{17 const lib = b.addExecutable(.{
18 .name = "lib",18 .name = "lib",
19 .root_source_file = .{ .path = "lib.zig" },19 .root_source_file = b.path("lib.zig"),
20 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),20 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
21 .optimize = optimize,21 .optimize = optimize,
22 .strip = false,22 .strip = false,
test/link/wasm/segments/build.zig+1-1
...@@ -15,7 +15,7 @@ pub fn build(b: *std.Build) void {...@@ -15,7 +15,7 @@ pub fn build(b: *std.Build) void {
15fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {15fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {
16 const lib = b.addExecutable(.{16 const lib = b.addExecutable(.{
17 .name = "lib",17 .name = "lib",
18 .root_source_file = .{ .path = "lib.zig" },18 .root_source_file = b.path("lib.zig"),
19 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),19 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
20 .optimize = optimize,20 .optimize = optimize,
21 .strip = false,21 .strip = false,
test/link/wasm/shared-memory/build.zig+1-1
...@@ -13,7 +13,7 @@ pub fn build(b: *std.Build) void {...@@ -13,7 +13,7 @@ pub fn build(b: *std.Build) void {
13fn add(b: *std.Build, test_step: *std.Build.Step, optimize_mode: std.builtin.OptimizeMode) void {13fn add(b: *std.Build, test_step: *std.Build.Step, optimize_mode: std.builtin.OptimizeMode) void {
14 const exe = b.addExecutable(.{14 const exe = b.addExecutable(.{
15 .name = "lib",15 .name = "lib",
16 .root_source_file = .{ .path = "lib.zig" },16 .root_source_file = b.path("lib.zig"),
17 .target = b.resolveTargetQuery(.{17 .target = b.resolveTargetQuery(.{
18 .cpu_arch = .wasm32,18 .cpu_arch = .wasm32,
19 .cpu_model = .{ .explicit = &std.Target.wasm.cpu.mvp },19 .cpu_model = .{ .explicit = &std.Target.wasm.cpu.mvp },
test/link/wasm/stack_pointer/build.zig+1-1
...@@ -15,7 +15,7 @@ pub fn build(b: *std.Build) void {...@@ -15,7 +15,7 @@ pub fn build(b: *std.Build) void {
15fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {15fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {
16 const lib = b.addExecutable(.{16 const lib = b.addExecutable(.{
17 .name = "lib",17 .name = "lib",
18 .root_source_file = .{ .path = "lib.zig" },18 .root_source_file = b.path("lib.zig"),
19 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),19 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
20 .optimize = optimize,20 .optimize = optimize,
21 .strip = false,21 .strip = false,
test/link/wasm/type/build.zig+1-1
...@@ -15,7 +15,7 @@ pub fn build(b: *std.Build) void {...@@ -15,7 +15,7 @@ pub fn build(b: *std.Build) void {
15fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {15fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {
16 const exe = b.addExecutable(.{16 const exe = b.addExecutable(.{
17 .name = "lib",17 .name = "lib",
18 .root_source_file = .{ .path = "lib.zig" },18 .root_source_file = b.path("lib.zig"),
19 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),19 .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
20 .optimize = optimize,20 .optimize = optimize,
21 .strip = false,21 .strip = false,
test/standalone/build.zig+1-1
...@@ -44,7 +44,7 @@ pub fn build(b: *std.Build) void {...@@ -44,7 +44,7 @@ pub fn build(b: *std.Build) void {
44 }) |tool_src_path| {44 }) |tool_src_path| {
45 const tool = b.addTest(.{45 const tool = b.addTest(.{
46 .name = std.fs.path.stem(tool_src_path),46 .name = std.fs.path.stem(tool_src_path),
47 .root_source_file = .{ .path = tool_src_path },47 .root_source_file = b.path(tool_src_path),
48 .optimize = .Debug,48 .optimize = .Debug,
49 .target = tools_target,49 .target = tools_target,
50 });50 });
test/standalone/c_compiler/build.zig+2-2
...@@ -30,7 +30,7 @@ fn add(...@@ -30,7 +30,7 @@ fn add(
30 .optimize = optimize,30 .optimize = optimize,
31 .target = target,31 .target = target,
32 });32 });
33 exe_c.addCSourceFile(.{ .file = .{ .path = "test.c" }, .flags = &[0][]const u8{} });33 exe_c.addCSourceFile(.{ .file = b.path("test.c"), .flags = &[0][]const u8{} });
34 exe_c.linkLibC();34 exe_c.linkLibC();
3535
36 const exe_cpp = b.addExecutable(.{36 const exe_cpp = b.addExecutable(.{
...@@ -39,7 +39,7 @@ fn add(...@@ -39,7 +39,7 @@ fn add(
39 .target = target,39 .target = target,
40 });40 });
41 b.default_step.dependOn(&exe_cpp.step);41 b.default_step.dependOn(&exe_cpp.step);
42 exe_cpp.addCSourceFile(.{ .file = .{ .path = "test.cpp" }, .flags = &[0][]const u8{} });42 exe_cpp.addCSourceFile(.{ .file = b.path("test.cpp"), .flags = &[0][]const u8{} });
43 exe_cpp.linkLibCpp();43 exe_cpp.linkLibCpp();
4444
45 switch (target.result.os.tag) {45 switch (target.result.os.tag) {
test/standalone/child_process/build.zig+2-2
...@@ -12,14 +12,14 @@ pub fn build(b: *std.Build) void {...@@ -12,14 +12,14 @@ pub fn build(b: *std.Build) void {
1212
13 const child = b.addExecutable(.{13 const child = b.addExecutable(.{
14 .name = "child",14 .name = "child",
15 .root_source_file = .{ .path = "child.zig" },15 .root_source_file = b.path("child.zig"),
16 .optimize = optimize,16 .optimize = optimize,
17 .target = target,17 .target = target,
18 });18 });
1919
20 const main = b.addExecutable(.{20 const main = b.addExecutable(.{
21 .name = "main",21 .name = "main",
22 .root_source_file = .{ .path = "main.zig" },22 .root_source_file = b.path("main.zig"),
23 .optimize = optimize,23 .optimize = optimize,
24 .target = target,24 .target = target,
25 });25 });
test/standalone/cmakedefine/build.zig+5-5
...@@ -4,7 +4,7 @@ const ConfigHeader = std.Build.Step.ConfigHeader;...@@ -4,7 +4,7 @@ const ConfigHeader = std.Build.Step.ConfigHeader;
4pub fn build(b: *std.Build) void {4pub fn build(b: *std.Build) void {
5 const config_header = b.addConfigHeader(5 const config_header = b.addConfigHeader(
6 .{6 .{
7 .style = .{ .cmake = .{ .path = "config.h.in" } },7 .style = .{ .cmake = b.path("config.h.in") },
8 .include_path = "config.h",8 .include_path = "config.h",
9 },9 },
10 .{10 .{
...@@ -28,7 +28,7 @@ pub fn build(b: *std.Build) void {...@@ -28,7 +28,7 @@ pub fn build(b: *std.Build) void {
2828
29 const pwd_sh = b.addConfigHeader(29 const pwd_sh = b.addConfigHeader(
30 .{30 .{
31 .style = .{ .cmake = .{ .path = "pwd.sh.in" } },31 .style = .{ .cmake = b.path("pwd.sh.in") },
32 .include_path = "pwd.sh",32 .include_path = "pwd.sh",
33 },33 },
34 .{ .DIR = "${PWD}" },34 .{ .DIR = "${PWD}" },
...@@ -36,7 +36,7 @@ pub fn build(b: *std.Build) void {...@@ -36,7 +36,7 @@ pub fn build(b: *std.Build) void {
3636
37 const sigil_header = b.addConfigHeader(37 const sigil_header = b.addConfigHeader(
38 .{38 .{
39 .style = .{ .cmake = .{ .path = "sigil.h.in" } },39 .style = .{ .cmake = b.path("sigil.h.in") },
40 .include_path = "sigil.h",40 .include_path = "sigil.h",
41 },41 },
42 .{},42 .{},
...@@ -44,7 +44,7 @@ pub fn build(b: *std.Build) void {...@@ -44,7 +44,7 @@ pub fn build(b: *std.Build) void {
4444
45 const stack_header = b.addConfigHeader(45 const stack_header = b.addConfigHeader(
46 .{46 .{
47 .style = .{ .cmake = .{ .path = "stack.h.in" } },47 .style = .{ .cmake = b.path("stack.h.in") },
48 .include_path = "stack.h",48 .include_path = "stack.h",
49 },49 },
50 .{50 .{
...@@ -57,7 +57,7 @@ pub fn build(b: *std.Build) void {...@@ -57,7 +57,7 @@ pub fn build(b: *std.Build) void {
5757
58 const wrapper_header = b.addConfigHeader(58 const wrapper_header = b.addConfigHeader(
59 .{59 .{
60 .style = .{ .cmake = .{ .path = "wrapper.h.in" } },60 .style = .{ .cmake = b.path("wrapper.h.in") },
61 .include_path = "wrapper.h",61 .include_path = "wrapper.h",
62 },62 },
63 .{63 .{
test/standalone/compiler_rt_panic/build.zig+1-1
...@@ -17,7 +17,7 @@ pub fn build(b: *std.Build) void {...@@ -17,7 +17,7 @@ pub fn build(b: *std.Build) void {
17 });17 });
18 exe.linkLibC();18 exe.linkLibC();
19 exe.addCSourceFile(.{19 exe.addCSourceFile(.{
20 .file = .{ .path = "main.c" },20 .file = b.path("main.c"),
21 .flags = &.{},21 .flags = &.{},
22 });22 });
23 exe.link_gc_sections = false;23 exe.link_gc_sections = false;
test/standalone/dep_diamond/build.zig+4-4
...@@ -7,21 +7,21 @@ pub fn build(b: *std.Build) void {...@@ -7,21 +7,21 @@ pub fn build(b: *std.Build) void {
7 const optimize: std.builtin.OptimizeMode = .Debug;7 const optimize: std.builtin.OptimizeMode = .Debug;
88
9 const shared = b.createModule(.{9 const shared = b.createModule(.{
10 .root_source_file = .{ .path = "shared.zig" },10 .root_source_file = b.path("shared.zig"),
11 });11 });
1212
13 const exe = b.addExecutable(.{13 const exe = b.addExecutable(.{
14 .name = "test",14 .name = "test",
15 .root_source_file = .{ .path = "test.zig" },15 .root_source_file = b.path("test.zig"),
16 .target = b.host,16 .target = b.host,
17 .optimize = optimize,17 .optimize = optimize,
18 });18 });
19 exe.root_module.addAnonymousImport("foo", .{19 exe.root_module.addAnonymousImport("foo", .{
20 .root_source_file = .{ .path = "foo.zig" },20 .root_source_file = b.path("foo.zig"),
21 .imports = &.{.{ .name = "shared", .module = shared }},21 .imports = &.{.{ .name = "shared", .module = shared }},
22 });22 });
23 exe.root_module.addAnonymousImport("bar", .{23 exe.root_module.addAnonymousImport("bar", .{
24 .root_source_file = .{ .path = "bar.zig" },24 .root_source_file = b.path("bar.zig"),
25 .imports = &.{.{ .name = "shared", .module = shared }},25 .imports = &.{.{ .name = "shared", .module = shared }},
26 });26 });
2727
test/standalone/dep_mutually_recursive/build.zig+3-3
...@@ -7,17 +7,17 @@ pub fn build(b: *std.Build) void {...@@ -7,17 +7,17 @@ pub fn build(b: *std.Build) void {
7 const optimize: std.builtin.OptimizeMode = .Debug;7 const optimize: std.builtin.OptimizeMode = .Debug;
88
9 const foo = b.createModule(.{9 const foo = b.createModule(.{
10 .root_source_file = .{ .path = "foo.zig" },10 .root_source_file = b.path("foo.zig"),
11 });11 });
12 const bar = b.createModule(.{12 const bar = b.createModule(.{
13 .root_source_file = .{ .path = "bar.zig" },13 .root_source_file = b.path("bar.zig"),
14 });14 });
15 foo.addImport("bar", bar);15 foo.addImport("bar", bar);
16 bar.addImport("foo", foo);16 bar.addImport("foo", foo);
1717
18 const exe = b.addExecutable(.{18 const exe = b.addExecutable(.{
19 .name = "test",19 .name = "test",
20 .root_source_file = .{ .path = "test.zig" },20 .root_source_file = b.path("test.zig"),
21 .target = b.host,21 .target = b.host,
22 .optimize = optimize,22 .optimize = optimize,
23 });23 });
test/standalone/dep_recursive/build.zig+2-2
...@@ -7,13 +7,13 @@ pub fn build(b: *std.Build) void {...@@ -7,13 +7,13 @@ pub fn build(b: *std.Build) void {
7 const optimize: std.builtin.OptimizeMode = .Debug;7 const optimize: std.builtin.OptimizeMode = .Debug;
88
9 const foo = b.createModule(.{9 const foo = b.createModule(.{
10 .root_source_file = .{ .path = "foo.zig" },10 .root_source_file = b.path("foo.zig"),
11 });11 });
12 foo.addImport("foo", foo);12 foo.addImport("foo", foo);
1313
14 const exe = b.addExecutable(.{14 const exe = b.addExecutable(.{
15 .name = "test",15 .name = "test",
16 .root_source_file = .{ .path = "test.zig" },16 .root_source_file = b.path("test.zig"),
17 .target = b.host,17 .target = b.host,
18 .optimize = optimize,18 .optimize = optimize,
19 });19 });
test/standalone/dep_shared_builtin/build.zig+2-2
...@@ -8,12 +8,12 @@ pub fn build(b: *std.Build) void {...@@ -8,12 +8,12 @@ pub fn build(b: *std.Build) void {
88
9 const exe = b.addExecutable(.{9 const exe = b.addExecutable(.{
10 .name = "test",10 .name = "test",
11 .root_source_file = .{ .path = "test.zig" },11 .root_source_file = b.path("test.zig"),
12 .target = b.host,12 .target = b.host,
13 .optimize = optimize,13 .optimize = optimize,
14 });14 });
15 exe.root_module.addAnonymousImport("foo", .{15 exe.root_module.addAnonymousImport("foo", .{
16 .root_source_file = .{ .path = "foo.zig" },16 .root_source_file = b.path("foo.zig"),
17 });17 });
1818
19 const run = b.addRunArtifact(exe);19 const run = b.addRunArtifact(exe);
test/standalone/dep_triangle/build.zig+3-3
...@@ -7,17 +7,17 @@ pub fn build(b: *std.Build) void {...@@ -7,17 +7,17 @@ pub fn build(b: *std.Build) void {
7 const optimize: std.builtin.OptimizeMode = .Debug;7 const optimize: std.builtin.OptimizeMode = .Debug;
88
9 const shared = b.createModule(.{9 const shared = b.createModule(.{
10 .root_source_file = .{ .path = "shared.zig" },10 .root_source_file = b.path("shared.zig"),
11 });11 });
1212
13 const exe = b.addExecutable(.{13 const exe = b.addExecutable(.{
14 .name = "test",14 .name = "test",
15 .root_source_file = .{ .path = "test.zig" },15 .root_source_file = b.path("test.zig"),
16 .target = b.host,16 .target = b.host,
17 .optimize = optimize,17 .optimize = optimize,
18 });18 });
19 exe.root_module.addAnonymousImport("foo", .{19 exe.root_module.addAnonymousImport("foo", .{
20 .root_source_file = .{ .path = "foo.zig" },20 .root_source_file = b.path("foo.zig"),
21 .imports = &.{.{ .name = "shared", .module = shared }},21 .imports = &.{.{ .name = "shared", .module = shared }},
22 });22 });
23 exe.root_module.addImport("shared", shared);23 exe.root_module.addImport("shared", shared);
test/standalone/depend_on_main_mod/build.zig+2-2
...@@ -9,13 +9,13 @@ pub fn build(b: *std.Build) void {...@@ -9,13 +9,13 @@ pub fn build(b: *std.Build) void {
99
10 const exe = b.addExecutable(.{10 const exe = b.addExecutable(.{
11 .name = "depend_on_main_mod",11 .name = "depend_on_main_mod",
12 .root_source_file = .{ .path = "src/main.zig" },12 .root_source_file = b.path("src/main.zig"),
13 .target = target,13 .target = target,
14 .optimize = optimize,14 .optimize = optimize,
15 });15 });
1616
17 const foo_module = b.addModule("foo", .{17 const foo_module = b.addModule("foo", .{
18 .root_source_file = .{ .path = "src/foo.zig" },18 .root_source_file = b.path("src/foo.zig"),
19 });19 });
2020
21 foo_module.addImport("root2", &exe.root_module);21 foo_module.addImport("root2", &exe.root_module);
test/standalone/dirname/build.zig+3-5
...@@ -6,9 +6,7 @@ pub fn build(b: *std.Build) void {...@@ -6,9 +6,7 @@ pub fn build(b: *std.Build) void {
6 const test_step = b.step("test", "Test it");6 const test_step = b.step("test", "Test it");
7 b.default_step = test_step;7 b.default_step = test_step;
88
9 const touch_src = std.Build.LazyPath{9 const touch_src = b.path("touch.zig");
10 .path = "touch.zig",
11 };
1210
13 const touch = b.addExecutable(.{11 const touch = b.addExecutable(.{
14 .name = "touch",12 .name = "touch",
...@@ -20,14 +18,14 @@ pub fn build(b: *std.Build) void {...@@ -20,14 +18,14 @@ pub fn build(b: *std.Build) void {
2018
21 const exists_in = b.addExecutable(.{19 const exists_in = b.addExecutable(.{
22 .name = "exists_in",20 .name = "exists_in",
23 .root_source_file = .{ .path = "exists_in.zig" },21 .root_source_file = b.path("exists_in.zig"),
24 .optimize = .Debug,22 .optimize = .Debug,
25 .target = target,23 .target = target,
26 });24 });
2725
28 const has_basename = b.addExecutable(.{26 const has_basename = b.addExecutable(.{
29 .name = "has_basename",27 .name = "has_basename",
30 .root_source_file = .{ .path = "has_basename.zig" },28 .root_source_file = b.path("has_basename.zig"),
31 .optimize = .Debug,29 .optimize = .Debug,
32 .target = target,30 .target = target,
33 });31 });
test/standalone/embed_generated_file/build.zig+2-2
...@@ -6,7 +6,7 @@ pub fn build(b: *std.Build) void {...@@ -6,7 +6,7 @@ pub fn build(b: *std.Build) void {
66
7 const bootloader = b.addExecutable(.{7 const bootloader = b.addExecutable(.{
8 .name = "bootloader",8 .name = "bootloader",
9 .root_source_file = .{ .path = "bootloader.zig" },9 .root_source_file = b.path("bootloader.zig"),
10 .target = b.resolveTargetQuery(.{10 .target = b.resolveTargetQuery(.{
11 .cpu_arch = .x86,11 .cpu_arch = .x86,
12 .os_tag = .freestanding,12 .os_tag = .freestanding,
...@@ -15,7 +15,7 @@ pub fn build(b: *std.Build) void {...@@ -15,7 +15,7 @@ pub fn build(b: *std.Build) void {
15 });15 });
1616
17 const exe = b.addTest(.{17 const exe = b.addTest(.{
18 .root_source_file = .{ .path = "main.zig" },18 .root_source_file = b.path("main.zig"),
19 .optimize = .Debug,19 .optimize = .Debug,
20 });20 });
21 exe.root_module.addAnonymousImport("bootloader.elf", .{21 exe.root_module.addAnonymousImport("bootloader.elf", .{
test/standalone/empty_env/build.zig+1-1
...@@ -14,7 +14,7 @@ pub fn build(b: *std.Build) void {...@@ -14,7 +14,7 @@ pub fn build(b: *std.Build) void {
1414
15 const main = b.addExecutable(.{15 const main = b.addExecutable(.{
16 .name = "main",16 .name = "main",
17 .root_source_file = .{ .path = "main.zig" },17 .root_source_file = b.path("main.zig"),
18 .target = b.host,18 .target = b.host,
19 .optimize = optimize,19 .optimize = optimize,
20 });20 });
test/standalone/extern/build.zig+2-2
...@@ -5,12 +5,12 @@ pub fn build(b: *std.Build) void {...@@ -5,12 +5,12 @@ pub fn build(b: *std.Build) void {
55
6 const obj = b.addObject(.{6 const obj = b.addObject(.{
7 .name = "exports",7 .name = "exports",
8 .root_source_file = .{ .path = "exports.zig" },8 .root_source_file = b.path("exports.zig"),
9 .target = b.host,9 .target = b.host,
10 .optimize = optimize,10 .optimize = optimize,
11 });11 });
12 const main = b.addTest(.{12 const main = b.addTest(.{
13 .root_source_file = .{ .path = "main.zig" },13 .root_source_file = b.path("main.zig"),
14 .optimize = optimize,14 .optimize = optimize,
15 });15 });
16 main.addObject(obj);16 main.addObject(obj);
test/standalone/global_linkage/build.zig+3-3
...@@ -9,20 +9,20 @@ pub fn build(b: *std.Build) void {...@@ -9,20 +9,20 @@ pub fn build(b: *std.Build) void {
99
10 const obj1 = b.addStaticLibrary(.{10 const obj1 = b.addStaticLibrary(.{
11 .name = "obj1",11 .name = "obj1",
12 .root_source_file = .{ .path = "obj1.zig" },12 .root_source_file = b.path("obj1.zig"),
13 .optimize = optimize,13 .optimize = optimize,
14 .target = target,14 .target = target,
15 });15 });
1616
17 const obj2 = b.addStaticLibrary(.{17 const obj2 = b.addStaticLibrary(.{
18 .name = "obj2",18 .name = "obj2",
19 .root_source_file = .{ .path = "obj2.zig" },19 .root_source_file = b.path("obj2.zig"),
20 .optimize = optimize,20 .optimize = optimize,
21 .target = target,21 .target = target,
22 });22 });
2323
24 const main = b.addTest(.{24 const main = b.addTest(.{
25 .root_source_file = .{ .path = "main.zig" },25 .root_source_file = b.path("main.zig"),
26 .optimize = optimize,26 .optimize = optimize,
27 });27 });
28 main.linkLibrary(obj1);28 main.linkLibrary(obj1);
test/standalone/install_headers/build.zig+2-2
...@@ -32,7 +32,7 @@ pub fn build(b: *std.Build) void {...@@ -32,7 +32,7 @@ pub fn build(b: *std.Build) void {
32 \\}32 \\}
33 ) });33 ) });
3434
35 libfoo.installHeadersDirectory(.{ .path = "include" }, "foo", .{ .exclude_extensions = &.{".ignore_me.h"} });35 libfoo.installHeadersDirectory(b.path("include"), "foo", .{ .exclude_extensions = &.{".ignore_me.h"} });
36 libfoo.installHeader(b.addWriteFiles().add("d.h",36 libfoo.installHeader(b.addWriteFiles().add("d.h",
37 \\#define FOO_D "D"37 \\#define FOO_D "D"
38 \\38 \\
...@@ -78,7 +78,7 @@ pub fn build(b: *std.Build) void {...@@ -78,7 +78,7 @@ pub fn build(b: *std.Build) void {
78 });78 });
79 const check_exists = b.addExecutable(.{79 const check_exists = b.addExecutable(.{
80 .name = "check_exists",80 .name = "check_exists",
81 .root_source_file = .{ .path = "check_exists.zig" },81 .root_source_file = b.path("check_exists.zig"),
82 .target = b.resolveTargetQuery(.{}),82 .target = b.resolveTargetQuery(.{}),
83 .optimize = .Debug,83 .optimize = .Debug,
84 });84 });
test/standalone/install_raw_hex/build.zig+1-1
...@@ -16,7 +16,7 @@ pub fn build(b: *std.Build) void {...@@ -16,7 +16,7 @@ pub fn build(b: *std.Build) void {
1616
17 const elf = b.addExecutable(.{17 const elf = b.addExecutable(.{
18 .name = "zig-nrf52-blink.elf",18 .name = "zig-nrf52-blink.elf",
19 .root_source_file = .{ .path = "main.zig" },19 .root_source_file = b.path("main.zig"),
20 .target = target,20 .target = target,
21 .optimize = optimize,21 .optimize = optimize,
22 });22 });
test/standalone/ios/build.zig+4-4
...@@ -21,10 +21,10 @@ pub fn build(b: *std.Build) void {...@@ -21,10 +21,10 @@ pub fn build(b: *std.Build) void {
21 .optimize = optimize,21 .optimize = optimize,
22 .target = target,22 .target = target,
23 });23 });
24 exe.addCSourceFile(.{ .file = .{ .path = "main.m" }, .flags = &.{} });24 exe.addCSourceFile(.{ .file = b.path("main.m"), .flags = &.{} });
25 exe.addSystemIncludePath(.{ .path = b.pathJoin(&.{ sdk, "/usr/include" }) });25 exe.addSystemIncludePath(b.path(b.pathJoin(&.{ sdk, "/usr/include" })));
26 exe.addSystemFrameworkPath(.{ .path = b.pathJoin(&.{ sdk, "/System/Library/Frameworks" }) });26 exe.addSystemFrameworkPath(b.path(b.pathJoin(&.{ sdk, "/System/Library/Frameworks" })));
27 exe.addLibraryPath(.{ .path = b.pathJoin(&.{ sdk, "/usr/lib" }) });27 exe.addLibraryPath(b.path(b.pathJoin(&.{ sdk, "/usr/lib" })));
28 exe.linkFramework("Foundation");28 exe.linkFramework("Foundation");
29 exe.linkFramework("UIKit");29 exe.linkFramework("UIKit");
30 exe.linkLibC();30 exe.linkLibC();
test/standalone/issue_11595/build.zig+1-1
...@@ -15,7 +15,7 @@ pub fn build(b: *std.Build) void {...@@ -15,7 +15,7 @@ pub fn build(b: *std.Build) void {
1515
16 const exe = b.addExecutable(.{16 const exe = b.addExecutable(.{
17 .name = "zigtest",17 .name = "zigtest",
18 .root_source_file = .{ .path = "main.zig" },18 .root_source_file = b.path("main.zig"),
19 .target = target,19 .target = target,
20 .optimize = optimize,20 .optimize = optimize,
21 });21 });
test/standalone/issue_12706/build.zig+1-1
...@@ -10,7 +10,7 @@ pub fn build(b: *std.Build) void {...@@ -10,7 +10,7 @@ pub fn build(b: *std.Build) void {
1010
11 const exe = b.addExecutable(.{11 const exe = b.addExecutable(.{
12 .name = "main",12 .name = "main",
13 .root_source_file = .{ .path = "main.zig" },13 .root_source_file = b.path("main.zig"),
14 .optimize = optimize,14 .optimize = optimize,
15 .target = target,15 .target = target,
16 });16 });
test/standalone/issue_339/build.zig+1-1
...@@ -9,7 +9,7 @@ pub fn build(b: *std.Build) void {...@@ -9,7 +9,7 @@ pub fn build(b: *std.Build) void {
99
10 const obj = b.addObject(.{10 const obj = b.addObject(.{
11 .name = "test",11 .name = "test",
12 .root_source_file = .{ .path = "test.zig" },12 .root_source_file = b.path("test.zig"),
13 .target = target,13 .target = target,
14 .optimize = optimize,14 .optimize = optimize,
15 });15 });
test/standalone/issue_794/build.zig+2-2
...@@ -5,9 +5,9 @@ pub fn build(b: *std.Build) void {...@@ -5,9 +5,9 @@ pub fn build(b: *std.Build) void {
5 b.default_step = test_step;5 b.default_step = test_step;
66
7 const test_artifact = b.addTest(.{7 const test_artifact = b.addTest(.{
8 .root_source_file = .{ .path = "main.zig" },8 .root_source_file = b.path("main.zig"),
9 });9 });
10 test_artifact.addIncludePath(.{ .path = "a_directory" });10 test_artifact.addIncludePath(b.path("a_directory"));
1111
12 // TODO: actually check the output12 // TODO: actually check the output
13 _ = test_artifact.getEmittedBin();13 _ = test_artifact.getEmittedBin();
test/standalone/issue_8550/build.zig+3-3
...@@ -15,12 +15,12 @@ pub fn build(b: *std.Build) !void {...@@ -15,12 +15,12 @@ pub fn build(b: *std.Build) !void {
1515
16 const kernel = b.addExecutable(.{16 const kernel = b.addExecutable(.{
17 .name = "kernel",17 .name = "kernel",
18 .root_source_file = .{ .path = "./main.zig" },18 .root_source_file = b.path("./main.zig"),
19 .optimize = optimize,19 .optimize = optimize,
20 .target = target,20 .target = target,
21 });21 });
22 kernel.addObjectFile(.{ .path = "./boot.S" });22 kernel.addObjectFile(b.path("./boot.S"));
23 kernel.setLinkerScript(.{ .path = "./linker.ld" });23 kernel.setLinkerScript(b.path("./linker.ld"));
24 b.installArtifact(kernel);24 b.installArtifact(kernel);
2525
26 test_step.dependOn(&kernel.step);26 test_step.dependOn(&kernel.step);
test/standalone/load_dynamic_library/build.zig+2-2
...@@ -17,7 +17,7 @@ pub fn build(b: *std.Build) void {...@@ -17,7 +17,7 @@ pub fn build(b: *std.Build) void {
1717
18 const lib = b.addSharedLibrary(.{18 const lib = b.addSharedLibrary(.{
19 .name = "add",19 .name = "add",
20 .root_source_file = .{ .path = "add.zig" },20 .root_source_file = b.path("add.zig"),
21 .version = .{ .major = 1, .minor = 0, .patch = 0 },21 .version = .{ .major = 1, .minor = 0, .patch = 0 },
22 .optimize = optimize,22 .optimize = optimize,
23 .target = target,23 .target = target,
...@@ -25,7 +25,7 @@ pub fn build(b: *std.Build) void {...@@ -25,7 +25,7 @@ pub fn build(b: *std.Build) void {
2525
26 const main = b.addExecutable(.{26 const main = b.addExecutable(.{
27 .name = "main",27 .name = "main",
28 .root_source_file = .{ .path = "main.zig" },28 .root_source_file = b.path("main.zig"),
29 .optimize = optimize,29 .optimize = optimize,
30 .target = target,30 .target = target,
31 });31 });
test/standalone/mix_c_files/build.zig+2-2
...@@ -18,11 +18,11 @@ pub fn build(b: *std.Build) void {...@@ -18,11 +18,11 @@ pub fn build(b: *std.Build) void {
18fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {18fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {
19 const exe = b.addExecutable(.{19 const exe = b.addExecutable(.{
20 .name = "test",20 .name = "test",
21 .root_source_file = .{ .path = "main.zig" },21 .root_source_file = b.path("main.zig"),
22 .target = b.host,22 .target = b.host,
23 .optimize = optimize,23 .optimize = optimize,
24 });24 });
25 exe.addCSourceFile(.{ .file = .{ .path = "test.c" }, .flags = &[_][]const u8{"-std=c11"} });25 exe.addCSourceFile(.{ .file = b.path("test.c"), .flags = &[_][]const u8{"-std=c11"} });
26 exe.linkLibC();26 exe.linkLibC();
2727
28 const run_cmd = b.addRunArtifact(exe);28 const run_cmd = b.addRunArtifact(exe);
test/standalone/mix_o_files/build.zig+2-2
...@@ -9,7 +9,7 @@ pub fn build(b: *std.Build) void {...@@ -9,7 +9,7 @@ pub fn build(b: *std.Build) void {
99
10 const obj = b.addObject(.{10 const obj = b.addObject(.{
11 .name = "base64",11 .name = "base64",
12 .root_source_file = .{ .path = "base64.zig" },12 .root_source_file = b.path("base64.zig"),
13 .optimize = optimize,13 .optimize = optimize,
14 .target = target,14 .target = target,
15 });15 });
...@@ -20,7 +20,7 @@ pub fn build(b: *std.Build) void {...@@ -20,7 +20,7 @@ pub fn build(b: *std.Build) void {
20 .target = target,20 .target = target,
21 });21 });
22 exe.addCSourceFile(.{22 exe.addCSourceFile(.{
23 .file = .{ .path = "test.c" },23 .file = b.path("test.c"),
24 .flags = &[_][]const u8{"-std=c99"},24 .flags = &[_][]const u8{"-std=c99"},
25 });25 });
26 exe.addObject(obj);26 exe.addObject(obj);
test/standalone/pie/build.zig+1-1
...@@ -11,7 +11,7 @@ pub fn build(b: *std.Build) void {...@@ -11,7 +11,7 @@ pub fn build(b: *std.Build) void {
11 });11 });
1212
13 const main = b.addTest(.{13 const main = b.addTest(.{
14 .root_source_file = .{ .path = "main.zig" },14 .root_source_file = b.path("main.zig"),
15 .optimize = optimize,15 .optimize = optimize,
16 .target = target,16 .target = target,
17 });17 });
test/standalone/pkg_import/build.zig+2-2
...@@ -8,11 +8,11 @@ pub fn build(b: *std.Build) void {...@@ -8,11 +8,11 @@ pub fn build(b: *std.Build) void {
88
9 const exe = b.addExecutable(.{9 const exe = b.addExecutable(.{
10 .name = "test",10 .name = "test",
11 .root_source_file = .{ .path = "test.zig" },11 .root_source_file = b.path("test.zig"),
12 .optimize = optimize,12 .optimize = optimize,
13 .target = b.host,13 .target = b.host,
14 });14 });
15 exe.root_module.addAnonymousImport("my_pkg", .{ .root_source_file = .{ .path = "pkg.zig" } });15 exe.root_module.addAnonymousImport("my_pkg", .{ .root_source_file = b.path("pkg.zig") });
1616
17 const run = b.addRunArtifact(exe);17 const run = b.addRunArtifact(exe);
18 test_step.dependOn(&run.step);18 test_step.dependOn(&run.step);
test/standalone/self_exe_symlink/build.zig+2-2
...@@ -15,14 +15,14 @@ pub fn build(b: *std.Build) void {...@@ -15,14 +15,14 @@ pub fn build(b: *std.Build) void {
1515
16 const main = b.addExecutable(.{16 const main = b.addExecutable(.{
17 .name = "main",17 .name = "main",
18 .root_source_file = .{ .path = "main.zig" },18 .root_source_file = b.path("main.zig"),
19 .optimize = optimize,19 .optimize = optimize,
20 .target = target,20 .target = target,
21 });21 });
2222
23 const create_symlink_exe = b.addExecutable(.{23 const create_symlink_exe = b.addExecutable(.{
24 .name = "create-symlink",24 .name = "create-symlink",
25 .root_source_file = .{ .path = "create-symlink.zig" },25 .root_source_file = b.path("create-symlink.zig"),
26 .optimize = optimize,26 .optimize = optimize,
27 .target = target,27 .target = target,
28 });28 });
test/standalone/shared_library/build.zig+2-2
...@@ -13,7 +13,7 @@ pub fn build(b: *std.Build) void {...@@ -13,7 +13,7 @@ pub fn build(b: *std.Build) void {
13 const target = b.host;13 const target = b.host;
14 const lib = b.addSharedLibrary(.{14 const lib = b.addSharedLibrary(.{
15 .name = "mathtest",15 .name = "mathtest",
16 .root_source_file = .{ .path = "mathtest.zig" },16 .root_source_file = b.path("mathtest.zig"),
17 .version = .{ .major = 1, .minor = 0, .patch = 0 },17 .version = .{ .major = 1, .minor = 0, .patch = 0 },
18 .target = target,18 .target = target,
19 .optimize = optimize,19 .optimize = optimize,
...@@ -25,7 +25,7 @@ pub fn build(b: *std.Build) void {...@@ -25,7 +25,7 @@ pub fn build(b: *std.Build) void {
25 .optimize = optimize,25 .optimize = optimize,
26 });26 });
27 exe.addCSourceFile(.{27 exe.addCSourceFile(.{
28 .file = .{ .path = "test.c" },28 .file = b.path("test.c"),
29 .flags = &[_][]const u8{"-std=c99"},29 .flags = &[_][]const u8{"-std=c99"},
30 });30 });
31 exe.linkLibrary(lib);31 exe.linkLibrary(lib);
test/standalone/simple/build.zig+2-2
...@@ -42,7 +42,7 @@ pub fn build(b: *std.Build) void {...@@ -42,7 +42,7 @@ pub fn build(b: *std.Build) void {
42 if (case.is_exe) {42 if (case.is_exe) {
43 const exe = b.addExecutable(.{43 const exe = b.addExecutable(.{
44 .name = std.fs.path.stem(case.src_path),44 .name = std.fs.path.stem(case.src_path),
45 .root_source_file = .{ .path = case.src_path },45 .root_source_file = b.path(case.src_path),
46 .optimize = optimize,46 .optimize = optimize,
47 .target = resolved_target,47 .target = resolved_target,
48 });48 });
...@@ -56,7 +56,7 @@ pub fn build(b: *std.Build) void {...@@ -56,7 +56,7 @@ pub fn build(b: *std.Build) void {
56 if (case.is_test) {56 if (case.is_test) {
57 const exe = b.addTest(.{57 const exe = b.addTest(.{
58 .name = std.fs.path.stem(case.src_path),58 .name = std.fs.path.stem(case.src_path),
59 .root_source_file = .{ .path = case.src_path },59 .root_source_file = b.path(case.src_path),
60 .optimize = optimize,60 .optimize = optimize,
61 .target = resolved_target,61 .target = resolved_target,
62 });62 });
test/standalone/stack_iterator/build.zig+4-4
...@@ -19,7 +19,7 @@ pub fn build(b: *std.Build) void {...@@ -19,7 +19,7 @@ pub fn build(b: *std.Build) void {
19 {19 {
20 const exe = b.addExecutable(.{20 const exe = b.addExecutable(.{
21 .name = "unwind_fp",21 .name = "unwind_fp",
22 .root_source_file = .{ .path = "unwind.zig" },22 .root_source_file = b.path("unwind.zig"),
23 .target = target,23 .target = target,
24 .optimize = optimize,24 .optimize = optimize,
25 .unwind_tables = if (target.result.isDarwin()) true else null,25 .unwind_tables = if (target.result.isDarwin()) true else null,
...@@ -42,7 +42,7 @@ pub fn build(b: *std.Build) void {...@@ -42,7 +42,7 @@ pub fn build(b: *std.Build) void {
42 {42 {
43 const exe = b.addExecutable(.{43 const exe = b.addExecutable(.{
44 .name = "unwind_nofp",44 .name = "unwind_nofp",
45 .root_source_file = .{ .path = "unwind.zig" },45 .root_source_file = b.path("unwind.zig"),
46 .target = target,46 .target = target,
47 .optimize = optimize,47 .optimize = optimize,
48 .unwind_tables = true,48 .unwind_tables = true,
...@@ -74,14 +74,14 @@ pub fn build(b: *std.Build) void {...@@ -74,14 +74,14 @@ pub fn build(b: *std.Build) void {
74 c_shared_lib.defineCMacro("LIB_API", "__declspec(dllexport)");74 c_shared_lib.defineCMacro("LIB_API", "__declspec(dllexport)");
7575
76 c_shared_lib.addCSourceFile(.{76 c_shared_lib.addCSourceFile(.{
77 .file = .{ .path = "shared_lib.c" },77 .file = b.path("shared_lib.c"),
78 .flags = &.{"-fomit-frame-pointer"},78 .flags = &.{"-fomit-frame-pointer"},
79 });79 });
80 c_shared_lib.linkLibC();80 c_shared_lib.linkLibC();
8181
82 const exe = b.addExecutable(.{82 const exe = b.addExecutable(.{
83 .name = "shared_lib_unwind",83 .name = "shared_lib_unwind",
84 .root_source_file = .{ .path = "shared_lib_unwind.zig" },84 .root_source_file = b.path("shared_lib_unwind.zig"),
85 .target = target,85 .target = target,
86 .optimize = optimize,86 .optimize = optimize,
87 .unwind_tables = if (target.result.isDarwin()) true else null,87 .unwind_tables = if (target.result.isDarwin()) true else null,
test/standalone/static_c_lib/build.zig+4-4
...@@ -11,15 +11,15 @@ pub fn build(b: *std.Build) void {...@@ -11,15 +11,15 @@ pub fn build(b: *std.Build) void {
11 .optimize = optimize,11 .optimize = optimize,
12 .target = b.host,12 .target = b.host,
13 });13 });
14 foo.addCSourceFile(.{ .file = .{ .path = "foo.c" }, .flags = &[_][]const u8{} });14 foo.addCSourceFile(.{ .file = b.path("foo.c"), .flags = &[_][]const u8{} });
15 foo.addIncludePath(.{ .path = "." });15 foo.addIncludePath(b.path("."));
1616
17 const test_exe = b.addTest(.{17 const test_exe = b.addTest(.{
18 .root_source_file = .{ .path = "foo.zig" },18 .root_source_file = b.path("foo.zig"),
19 .optimize = optimize,19 .optimize = optimize,
20 });20 });
21 test_exe.linkLibrary(foo);21 test_exe.linkLibrary(foo);
22 test_exe.addIncludePath(.{ .path = "." });22 test_exe.addIncludePath(b.path("."));
2323
24 test_step.dependOn(&b.addRunArtifact(test_exe).step);24 test_step.dependOn(&b.addRunArtifact(test_exe).step);
25}25}
test/standalone/strip_empty_loop/build.zig+1-1
...@@ -9,7 +9,7 @@ pub fn build(b: *std.Build) void {...@@ -9,7 +9,7 @@ pub fn build(b: *std.Build) void {
99
10 const main = b.addExecutable(.{10 const main = b.addExecutable(.{
11 .name = "main",11 .name = "main",
12 .root_source_file = .{ .path = "main.zig" },12 .root_source_file = b.path("main.zig"),
13 .optimize = optimize,13 .optimize = optimize,
14 .target = target,14 .target = target,
15 .strip = true,15 .strip = true,
test/standalone/strip_struct_init/build.zig+1-1
...@@ -7,7 +7,7 @@ pub fn build(b: *std.Build) void {...@@ -7,7 +7,7 @@ pub fn build(b: *std.Build) void {
7 const optimize: std.builtin.OptimizeMode = .Debug;7 const optimize: std.builtin.OptimizeMode = .Debug;
88
9 const main = b.addTest(.{9 const main = b.addTest(.{
10 .root_source_file = .{ .path = "main.zig" },10 .root_source_file = b.path("main.zig"),
11 .optimize = optimize,11 .optimize = optimize,
12 .strip = true,12 .strip = true,
13 });13 });
test/standalone/test_runner_module_imports/build.zig+3-3
...@@ -2,13 +2,13 @@ const std = @import("std");...@@ -2,13 +2,13 @@ const std = @import("std");
22
3pub fn build(b: *std.Build) void {3pub fn build(b: *std.Build) void {
4 const t = b.addTest(.{4 const t = b.addTest(.{
5 .root_source_file = .{ .path = "src/main.zig" },5 .root_source_file = b.path("src/main.zig"),
6 .test_runner = b.path("test_runner/main.zig"),6 .test_runner = b.path("test_runner/main.zig"),
7 });7 });
88
9 const module1 = b.createModule(.{ .root_source_file = .{ .path = "module1/main.zig" } });9 const module1 = b.createModule(.{ .root_source_file = b.path("module1/main.zig") });
10 const module2 = b.createModule(.{10 const module2 = b.createModule(.{
11 .root_source_file = .{ .path = "module2/main.zig" },11 .root_source_file = b.path("module2/main.zig"),
12 .imports = &.{.{ .name = "module1", .module = module1 }},12 .imports = &.{.{ .name = "module1", .module = module1 }},
13 });13 });
1414
test/standalone/test_runner_path/build.zig+1-1
...@@ -7,7 +7,7 @@ pub fn build(b: *std.Build) void {...@@ -7,7 +7,7 @@ pub fn build(b: *std.Build) void {
7 b.default_step = test_step;7 b.default_step = test_step;
88
9 const test_exe = b.addTest(.{9 const test_exe = b.addTest(.{
10 .root_source_file = .{ .path = "test.zig" },10 .root_source_file = b.path("test.zig"),
11 });11 });
12 test_exe.test_runner = b.path("test_runner.zig");12 test_exe.test_runner = b.path("test_runner.zig");
1313
test/standalone/use_alias/build.zig+2-2
...@@ -7,10 +7,10 @@ pub fn build(b: *std.Build) void {...@@ -7,10 +7,10 @@ pub fn build(b: *std.Build) void {
7 const optimize: std.builtin.OptimizeMode = .Debug;7 const optimize: std.builtin.OptimizeMode = .Debug;
88
9 const main = b.addTest(.{9 const main = b.addTest(.{
10 .root_source_file = .{ .path = "main.zig" },10 .root_source_file = b.path("main.zig"),
11 .optimize = optimize,11 .optimize = optimize,
12 });12 });
13 main.addIncludePath(.{ .path = "." });13 main.addIncludePath(b.path("."));
1414
15 test_step.dependOn(&b.addRunArtifact(main).step);15 test_step.dependOn(&b.addRunArtifact(main).step);
16}16}
test/standalone/windows_entry_points/build.zig+4-4
...@@ -17,7 +17,7 @@ pub fn build(b: *std.Build) void {...@@ -17,7 +17,7 @@ pub fn build(b: *std.Build) void {
17 .optimize = .Debug,17 .optimize = .Debug,
18 .link_libc = true,18 .link_libc = true,
19 });19 });
20 exe.addCSourceFile(.{ .file = .{ .path = "main.c" } });20 exe.addCSourceFile(.{ .file = b.path("main.c") });
2121
22 _ = exe.getEmittedBin();22 _ = exe.getEmittedBin();
23 test_step.dependOn(&exe.step);23 test_step.dependOn(&exe.step);
...@@ -31,7 +31,7 @@ pub fn build(b: *std.Build) void {...@@ -31,7 +31,7 @@ pub fn build(b: *std.Build) void {
31 .link_libc = true,31 .link_libc = true,
32 });32 });
33 exe.mingw_unicode_entry_point = true;33 exe.mingw_unicode_entry_point = true;
34 exe.addCSourceFile(.{ .file = .{ .path = "wmain.c" } });34 exe.addCSourceFile(.{ .file = b.path("wmain.c") });
3535
36 _ = exe.getEmittedBin();36 _ = exe.getEmittedBin();
37 test_step.dependOn(&exe.step);37 test_step.dependOn(&exe.step);
...@@ -45,7 +45,7 @@ pub fn build(b: *std.Build) void {...@@ -45,7 +45,7 @@ pub fn build(b: *std.Build) void {
45 .link_libc = true,45 .link_libc = true,
46 });46 });
47 // Note: `exe.subsystem = .Windows;` is not necessary47 // Note: `exe.subsystem = .Windows;` is not necessary
48 exe.addCSourceFile(.{ .file = .{ .path = "winmain.c" } });48 exe.addCSourceFile(.{ .file = b.path("winmain.c") });
4949
50 _ = exe.getEmittedBin();50 _ = exe.getEmittedBin();
51 test_step.dependOn(&exe.step);51 test_step.dependOn(&exe.step);
...@@ -60,7 +60,7 @@ pub fn build(b: *std.Build) void {...@@ -60,7 +60,7 @@ pub fn build(b: *std.Build) void {
60 });60 });
61 exe.mingw_unicode_entry_point = true;61 exe.mingw_unicode_entry_point = true;
62 // Note: `exe.subsystem = .Windows;` is not necessary62 // Note: `exe.subsystem = .Windows;` is not necessary
63 exe.addCSourceFile(.{ .file = .{ .path = "wwinmain.c" } });63 exe.addCSourceFile(.{ .file = b.path("wwinmain.c") });
6464
65 _ = exe.getEmittedBin();65 _ = exe.getEmittedBin();
66 test_step.dependOn(&exe.step);66 test_step.dependOn(&exe.step);
test/standalone/windows_resources/build.zig+2-2
...@@ -25,12 +25,12 @@ fn add(...@@ -25,12 +25,12 @@ fn add(
25) void {25) void {
26 const exe = b.addExecutable(.{26 const exe = b.addExecutable(.{
27 .name = "zig_resource_test",27 .name = "zig_resource_test",
28 .root_source_file = .{ .path = "main.zig" },28 .root_source_file = b.path("main.zig"),
29 .target = target,29 .target = target,
30 .optimize = .Debug,30 .optimize = .Debug,
31 });31 });
32 exe.addWin32ResourceFile(.{32 exe.addWin32ResourceFile(.{
33 .file = .{ .path = "res/zig.rc" },33 .file = b.path("res/zig.rc"),
34 .flags = &.{"/c65001"}, // UTF-8 code page34 .flags = &.{"/c65001"}, // UTF-8 code page
35 });35 });
36 exe.rc_includes = switch (rc_includes) {36 exe.rc_includes = switch (rc_includes) {
test/standalone/zerolength_check/build.zig+1-1
...@@ -12,7 +12,7 @@ pub fn build(b: *std.Build) void {...@@ -12,7 +12,7 @@ pub fn build(b: *std.Build) void {
1212
13fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {13fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode) void {
14 const unit_tests = b.addTest(.{14 const unit_tests = b.addTest(.{
15 .root_source_file = .{ .path = "src/main.zig" },15 .root_source_file = b.path("src/main.zig"),
16 .target = b.resolveTargetQuery(.{16 .target = b.resolveTargetQuery(.{
17 .os_tag = .wasi,17 .os_tag = .wasi,
18 .cpu_arch = .wasm32,18 .cpu_arch = .wasm32,
test/tests.zig+9-9
...@@ -641,7 +641,7 @@ pub fn addStackTraceTests(...@@ -641,7 +641,7 @@ pub fn addStackTraceTests(
641) *Step {641) *Step {
642 const check_exe = b.addExecutable(.{642 const check_exe = b.addExecutable(.{
643 .name = "check-stack-trace",643 .name = "check-stack-trace",
644 .root_source_file = .{ .path = "test/src/check-stack-trace.zig" },644 .root_source_file = b.path("test/src/check-stack-trace.zig"),
645 .target = b.host,645 .target = b.host,
646 .optimize = .Debug,646 .optimize = .Debug,
647 });647 });
...@@ -879,7 +879,7 @@ pub fn addCliTests(b: *std.Build) *Step {...@@ -879,7 +879,7 @@ pub fn addCliTests(b: *std.Build) *Step {
879 run6.step.dependOn(&write6.step);879 run6.step.dependOn(&write6.step);
880880
881 // TODO change this to an exact match881 // TODO change this to an exact match
882 const check6 = b.addCheckFile(.{ .path = fmt6_path }, .{882 const check6 = b.addCheckFile(.{ .cwd_relative = fmt6_path }, .{
883 .expected_matches = &.{883 .expected_matches = &.{
884 "// no reason",884 "// no reason",
885 },885 },
...@@ -1037,7 +1037,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {...@@ -1037,7 +1037,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {
1037 options.max_rss;1037 options.max_rss;
10381038
1039 const these_tests = b.addTest(.{1039 const these_tests = b.addTest(.{
1040 .root_source_file = .{ .path = options.root_src },1040 .root_source_file = b.path(options.root_src),
1041 .optimize = test_target.optimize_mode,1041 .optimize = test_target.optimize_mode,
1042 .target = resolved_target,1042 .target = resolved_target,
1043 .max_rss = max_rss,1043 .max_rss = max_rss,
...@@ -1046,7 +1046,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {...@@ -1046,7 +1046,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {
1046 .single_threaded = test_target.single_threaded,1046 .single_threaded = test_target.single_threaded,
1047 .use_llvm = test_target.use_llvm,1047 .use_llvm = test_target.use_llvm,
1048 .use_lld = test_target.use_lld,1048 .use_lld = test_target.use_lld,
1049 .zig_lib_dir = .{ .path = "lib" },1049 .zig_lib_dir = b.path("lib"),
1050 .pic = test_target.pic,1050 .pic = test_target.pic,
1051 .strip = test_target.strip,1051 .strip = test_target.strip,
1052 });1052 });
...@@ -1062,7 +1062,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {...@@ -1062,7 +1062,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {
1062 const use_lld = if (test_target.use_lld == false) "-no-lld" else "";1062 const use_lld = if (test_target.use_lld == false) "-no-lld" else "";
1063 const use_pic = if (test_target.pic == true) "-pic" else "";1063 const use_pic = if (test_target.pic == true) "-pic" else "";
10641064
1065 for (options.include_paths) |include_path| these_tests.addIncludePath(.{ .path = include_path });1065 for (options.include_paths) |include_path| these_tests.addIncludePath(b.path(include_path));
10661066
1067 const qualified_name = b.fmt("{s}-{s}-{s}-{s}{s}{s}{s}{s}{s}", .{1067 const qualified_name = b.fmt("{s}-{s}-{s}-{s}{s}{s}{s}{s}{s}", .{
1068 options.name,1068 options.name,
...@@ -1084,7 +1084,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {...@@ -1084,7 +1084,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {
1084 .name = qualified_name,1084 .name = qualified_name,
1085 .link_libc = test_target.link_libc,1085 .link_libc = test_target.link_libc,
1086 .target = b.resolveTargetQuery(altered_query),1086 .target = b.resolveTargetQuery(altered_query),
1087 .zig_lib_dir = .{ .path = "lib" },1087 .zig_lib_dir = b.path("lib"),
1088 });1088 });
1089 compile_c.addCSourceFile(.{1089 compile_c.addCSourceFile(.{
1090 .file = these_tests.getEmittedBin(),1090 .file = these_tests.getEmittedBin(),
...@@ -1113,7 +1113,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {...@@ -1113,7 +1113,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {
1113 "-Wno-absolute-value",1113 "-Wno-absolute-value",
1114 },1114 },
1115 });1115 });
1116 compile_c.addIncludePath(.{ .path = "lib" }); // for zig.h1116 compile_c.addIncludePath(b.path("lib")); // for zig.h
1117 if (target.os.tag == .windows) {1117 if (target.os.tag == .windows) {
1118 if (true) {1118 if (true) {
1119 // Unfortunately this requires about 8G of RAM for clang to compile1119 // Unfortunately this requires about 8G of RAM for clang to compile
...@@ -1189,7 +1189,7 @@ pub fn addCAbiTests(b: *std.Build, skip_non_native: bool, skip_release: bool) *S...@@ -1189,7 +1189,7 @@ pub fn addCAbiTests(b: *std.Build, skip_non_native: bool, skip_release: bool) *S
1189 if (c_abi_target.use_lld == false) "-no-lld" else "",1189 if (c_abi_target.use_lld == false) "-no-lld" else "",
1190 if (c_abi_target.pic == true) "-pic" else "",1190 if (c_abi_target.pic == true) "-pic" else "",
1191 }),1191 }),
1192 .root_source_file = .{ .path = "test/c_abi/main.zig" },1192 .root_source_file = b.path("test/c_abi/main.zig"),
1193 .target = resolved_target,1193 .target = resolved_target,
1194 .optimize = optimize_mode,1194 .optimize = optimize_mode,
1195 .link_libc = true,1195 .link_libc = true,
...@@ -1199,7 +1199,7 @@ pub fn addCAbiTests(b: *std.Build, skip_non_native: bool, skip_release: bool) *S...@@ -1199,7 +1199,7 @@ pub fn addCAbiTests(b: *std.Build, skip_non_native: bool, skip_release: bool) *S
1199 .strip = c_abi_target.strip,1199 .strip = c_abi_target.strip,
1200 });1200 });
1201 test_step.addCSourceFile(.{1201 test_step.addCSourceFile(.{
1202 .file = .{ .path = "test/c_abi/cfuncs.c" },1202 .file = b.path("test/c_abi/cfuncs.c"),
1203 .flags = &.{"-std=c99"},1203 .flags = &.{"-std=c99"},
1204 });1204 });
1205 for (c_abi_target.c_defines) |define| test_step.defineCMacro(define, null);1205 for (c_abi_target.c_defines) |define| test_step.defineCMacro(define, null);