aboutsummaryrefslogtreecommitdiff
path: root/test/link/macho
diff options
context:
space:
mode:
Diffstat (limited to 'test/link/macho')
-rw-r--r--test/link/macho/bugs/13056/build.zig10
-rw-r--r--test/link/macho/dead_strip/build.zig2
-rw-r--r--test/link/macho/dead_strip_dylibs/build.zig2
-rw-r--r--test/link/macho/dylib/build.zig10
-rw-r--r--test/link/macho/empty/build.zig4
-rw-r--r--test/link/macho/entry/build.zig2
-rw-r--r--test/link/macho/entry_in_archive/build.zig2
-rw-r--r--test/link/macho/entry_in_dylib/build.zig4
-rw-r--r--test/link/macho/headerpad/build.zig2
-rw-r--r--test/link/macho/needed_framework/build.zig2
-rw-r--r--test/link/macho/needed_library/build.zig8
-rw-r--r--test/link/macho/objc/build.zig6
-rw-r--r--test/link/macho/objcpp/build.zig6
-rw-r--r--test/link/macho/pagezero/build.zig4
-rw-r--r--test/link/macho/search_strategy/build.zig12
-rw-r--r--test/link/macho/stack_size/build.zig2
-rw-r--r--test/link/macho/tls/build.zig2
-rw-r--r--test/link/macho/unwind_info/build.zig2
-rw-r--r--test/link/macho/weak_framework/build.zig2
-rw-r--r--test/link/macho/weak_library/build.zig8
20 files changed, 46 insertions, 46 deletions
diff --git a/test/link/macho/bugs/13056/build.zig b/test/link/macho/bugs/13056/build.zig
index 1ac50a61c6..eade752bc4 100644
--- a/test/link/macho/bugs/13056/build.zig
+++ b/test/link/macho/bugs/13056/build.zig
@@ -23,13 +23,13 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
.name = "test",
.optimize = optimize,
});
- exe.addSystemIncludePath(std.fs.path.join(b.allocator, &.{ sdk.path, "/usr/include" }) catch unreachable);
- exe.addIncludePath(std.fs.path.join(b.allocator, &.{ sdk.path, "/usr/include/c++/v1" }) catch unreachable);
- exe.addCSourceFile("test.cpp", &.{
+ exe.addSystemIncludePath(.{ .path = b.pathJoin(&.{ sdk.path, "/usr/include" }) });
+ exe.addIncludePath(.{ .path = b.pathJoin(&.{ sdk.path, "/usr/include/c++/v1" }) });
+ exe.addCSourceFile(.{ .file = .{ .path = "test.cpp" }, .flags = &.{
"-nostdlib++",
"-nostdinc++",
- });
- exe.addObjectFile(std.fs.path.join(b.allocator, &.{ sdk.path, "/usr/lib/libc++.tbd" }) catch unreachable);
+ } });
+ exe.addObjectFile(.{ .path = b.pathJoin(&.{ sdk.path, "/usr/lib/libc++.tbd" }) });
const run_cmd = b.addRunArtifact(exe);
run_cmd.expectStdErrEqual("x: 5\n");
diff --git a/test/link/macho/dead_strip/build.zig b/test/link/macho/dead_strip/build.zig
index 8dd75b7019..8b8449b6b2 100644
--- a/test/link/macho/dead_strip/build.zig
+++ b/test/link/macho/dead_strip/build.zig
@@ -52,7 +52,7 @@ fn createScenario(
.optimize = optimize,
.target = target,
});
- exe.addCSourceFile("main.c", &[0][]const u8{});
+ exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &[0][]const u8{} });
exe.linkLibC();
return exe;
}
diff --git a/test/link/macho/dead_strip_dylibs/build.zig b/test/link/macho/dead_strip_dylibs/build.zig
index 4767a7cf34..cf243b5231 100644
--- a/test/link/macho/dead_strip_dylibs/build.zig
+++ b/test/link/macho/dead_strip_dylibs/build.zig
@@ -53,7 +53,7 @@ fn createScenario(
.name = name,
.optimize = optimize,
});
- exe.addCSourceFile("main.c", &[0][]const u8{});
+ exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &[0][]const u8{} });
exe.linkLibC();
exe.linkFramework("Cocoa");
return exe;
diff --git a/test/link/macho/dylib/build.zig b/test/link/macho/dylib/build.zig
index de693625d0..aecc9b38ec 100644
--- a/test/link/macho/dylib/build.zig
+++ b/test/link/macho/dylib/build.zig
@@ -21,7 +21,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
.optimize = optimize,
.target = target,
});
- dylib.addCSourceFile("a.c", &.{});
+ dylib.addCSourceFile(.{ .file = .{ .path = "a.c" }, .flags = &.{} });
dylib.linkLibC();
const check_dylib = dylib.checkObject();
@@ -39,10 +39,10 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
.optimize = optimize,
.target = target,
});
- exe.addCSourceFile("main.c", &.{});
+ exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &.{} });
exe.linkSystemLibrary("a");
- exe.addLibraryPathDirectorySource(dylib.getOutputDirectorySource());
- exe.addRPathDirectorySource(dylib.getOutputDirectorySource());
+ exe.addLibraryPath(dylib.getEmitDirectory());
+ exe.addRPath(dylib.getEmitDirectory());
exe.linkLibC();
const check_exe = exe.checkObject();
@@ -55,7 +55,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
check_exe.checkStart();
check_exe.checkExact("cmd RPATH");
- check_exe.checkExactFileSource("path", dylib.getOutputDirectorySource());
+ check_exe.checkExactPath("path", dylib.getOutputDirectorySource());
test_step.dependOn(&check_exe.step);
const run = b.addRunArtifact(exe);
diff --git a/test/link/macho/empty/build.zig b/test/link/macho/empty/build.zig
index 9933746d53..6a13507702 100644
--- a/test/link/macho/empty/build.zig
+++ b/test/link/macho/empty/build.zig
@@ -20,8 +20,8 @@ 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("empty.c", &[0][]const u8{});
+ exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &[0][]const u8{} });
+ exe.addCSourceFile(.{ .file = .{ .path = "empty.c" }, .flags = &[0][]const u8{} });
exe.linkLibC();
const run_cmd = b.addRunArtifact(exe);
diff --git a/test/link/macho/entry/build.zig b/test/link/macho/entry/build.zig
index a5269ff6ab..fcba02cd9a 100644
--- a/test/link/macho/entry/build.zig
+++ b/test/link/macho/entry/build.zig
@@ -18,7 +18,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
.optimize = optimize,
.target = .{ .os_tag = .macos },
});
- exe.addCSourceFile("main.c", &.{});
+ exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &.{} });
exe.linkLibC();
exe.entry_symbol_name = "_non_main";
diff --git a/test/link/macho/entry_in_archive/build.zig b/test/link/macho/entry_in_archive/build.zig
index f4b04bd162..f48e612d95 100644
--- a/test/link/macho/entry_in_archive/build.zig
+++ b/test/link/macho/entry_in_archive/build.zig
@@ -18,7 +18,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
.optimize = optimize,
.target = .{ .os_tag = .macos },
});
- lib.addCSourceFile("main.c", &.{});
+ lib.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &.{} });
lib.linkLibC();
const exe = b.addExecutable(.{
diff --git a/test/link/macho/entry_in_dylib/build.zig b/test/link/macho/entry_in_dylib/build.zig
index a5deaa73fe..97ffa917b4 100644
--- a/test/link/macho/entry_in_dylib/build.zig
+++ b/test/link/macho/entry_in_dylib/build.zig
@@ -18,7 +18,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
.optimize = optimize,
.target = .{ .os_tag = .macos },
});
- lib.addCSourceFile("bootstrap.c", &.{});
+ lib.addCSourceFile(.{ .file = .{ .path = "bootstrap.c" }, .flags = &.{} });
lib.linkLibC();
lib.linker_allow_shlib_undefined = true;
@@ -27,7 +27,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
.optimize = optimize,
.target = .{ .os_tag = .macos },
});
- exe.addCSourceFile("main.c", &.{});
+ exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &.{} });
exe.linkLibrary(lib);
exe.linkLibC();
exe.entry_symbol_name = "_bootstrap";
diff --git a/test/link/macho/headerpad/build.zig b/test/link/macho/headerpad/build.zig
index 2c1146f249..e1aebb0a8f 100644
--- a/test/link/macho/headerpad/build.zig
+++ b/test/link/macho/headerpad/build.zig
@@ -113,7 +113,7 @@ fn simpleExe(
.name = name,
.optimize = optimize,
});
- exe.addCSourceFile("main.c", &.{});
+ exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &.{} });
exe.linkLibC();
exe.linkFramework("CoreFoundation");
exe.linkFramework("Foundation");
diff --git a/test/link/macho/needed_framework/build.zig b/test/link/macho/needed_framework/build.zig
index 2323f277e6..f189ef7578 100644
--- a/test/link/macho/needed_framework/build.zig
+++ b/test/link/macho/needed_framework/build.zig
@@ -20,7 +20,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
.name = "test",
.optimize = optimize,
});
- exe.addCSourceFile("main.c", &[0][]const u8{});
+ exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &[0][]const u8{} });
exe.linkLibC();
exe.linkFrameworkNeeded("Cocoa");
exe.dead_strip_dylibs = true;
diff --git a/test/link/macho/needed_library/build.zig b/test/link/macho/needed_library/build.zig
index 26c69ea815..1c2cd9b452 100644
--- a/test/link/macho/needed_library/build.zig
+++ b/test/link/macho/needed_library/build.zig
@@ -21,7 +21,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
.optimize = optimize,
.target = target,
});
- dylib.addCSourceFile("a.c", &.{});
+ dylib.addCSourceFile(.{ .file = .{ .path = "a.c" }, .flags = &.{} });
dylib.linkLibC();
// -dead_strip_dylibs
@@ -31,11 +31,11 @@ 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.linkLibC();
exe.linkSystemLibraryNeeded("a");
- exe.addLibraryPathDirectorySource(dylib.getOutputDirectorySource());
- exe.addRPathDirectorySource(dylib.getOutputDirectorySource());
+ exe.addLibraryPath(dylib.getEmitDirectory());
+ exe.addRPath(dylib.getEmitDirectory());
exe.dead_strip_dylibs = true;
const check = exe.checkObject();
diff --git a/test/link/macho/objc/build.zig b/test/link/macho/objc/build.zig
index 4cd12f786f..979c0aa943 100644
--- a/test/link/macho/objc/build.zig
+++ b/test/link/macho/objc/build.zig
@@ -18,9 +18,9 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
.name = "test",
.optimize = optimize,
});
- exe.addIncludePath(".");
- exe.addCSourceFile("Foo.m", &[0][]const u8{});
- exe.addCSourceFile("test.m", &[0][]const u8{});
+ exe.addIncludePath(.{ .path = "." });
+ exe.addCSourceFile(.{ .file = .{ .path = "Foo.m" }, .flags = &[0][]const u8{} });
+ exe.addCSourceFile(.{ .file = .{ .path = "test.m" }, .flags = &[0][]const u8{} });
exe.linkLibC();
// TODO when we figure out how to ship framework stubs for cross-compilation,
// populate paths to the sysroot here.
diff --git a/test/link/macho/objcpp/build.zig b/test/link/macho/objcpp/build.zig
index aebf0e17fd..183d3cb9d3 100644
--- a/test/link/macho/objcpp/build.zig
+++ b/test/link/macho/objcpp/build.zig
@@ -19,9 +19,9 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
.optimize = optimize,
});
b.default_step.dependOn(&exe.step);
- exe.addIncludePath(".");
- exe.addCSourceFile("Foo.mm", &[0][]const u8{});
- exe.addCSourceFile("test.mm", &[0][]const u8{});
+ exe.addIncludePath(.{ .path = "." });
+ exe.addCSourceFile(.{ .file = .{ .path = "Foo.mm" }, .flags = &[0][]const u8{} });
+ exe.addCSourceFile(.{ .file = .{ .path = "test.mm" }, .flags = &[0][]const u8{} });
exe.linkLibCpp();
// TODO when we figure out how to ship framework stubs for cross-compilation,
// populate paths to the sysroot here.
diff --git a/test/link/macho/pagezero/build.zig b/test/link/macho/pagezero/build.zig
index f7b13e171e..5a07138464 100644
--- a/test/link/macho/pagezero/build.zig
+++ b/test/link/macho/pagezero/build.zig
@@ -15,7 +15,7 @@ pub fn build(b: *std.Build) void {
.optimize = optimize,
.target = target,
});
- exe.addCSourceFile("main.c", &.{});
+ exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &.{} });
exe.linkLibC();
exe.pagezero_size = 0x4000;
@@ -39,7 +39,7 @@ pub fn build(b: *std.Build) void {
.optimize = optimize,
.target = target,
});
- exe.addCSourceFile("main.c", &.{});
+ exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &.{} });
exe.linkLibC();
exe.pagezero_size = 0;
diff --git a/test/link/macho/search_strategy/build.zig b/test/link/macho/search_strategy/build.zig
index df0cab9d5d..3ecefc306b 100644
--- a/test/link/macho/search_strategy/build.zig
+++ b/test/link/macho/search_strategy/build.zig
@@ -55,7 +55,7 @@ fn createScenario(
.optimize = optimize,
.target = target,
});
- static.addCSourceFile("a.c", &.{});
+ static.addCSourceFile(.{ .file = .{ .path = "a.c" }, .flags = &.{} });
static.linkLibC();
static.override_dest_dir = std.Build.InstallDir{
.custom = "static",
@@ -67,7 +67,7 @@ fn createScenario(
.optimize = optimize,
.target = target,
});
- dylib.addCSourceFile("a.c", &.{});
+ dylib.addCSourceFile(.{ .file = .{ .path = "a.c" }, .flags = &.{} });
dylib.linkLibC();
dylib.override_dest_dir = std.Build.InstallDir{
.custom = "dynamic",
@@ -78,11 +78,11 @@ fn createScenario(
.optimize = optimize,
.target = target,
});
- exe.addCSourceFile("main.c", &.{});
+ exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &.{} });
exe.linkSystemLibraryName(name);
exe.linkLibC();
- exe.addLibraryPathDirectorySource(static.getOutputDirectorySource());
- exe.addLibraryPathDirectorySource(dylib.getOutputDirectorySource());
- exe.addRPathDirectorySource(dylib.getOutputDirectorySource());
+ exe.addLibraryPath(static.getEmitDirectory());
+ exe.addLibraryPath(dylib.getEmitDirectory());
+ exe.addRPath(dylib.getEmitDirectory());
return exe;
}
diff --git a/test/link/macho/stack_size/build.zig b/test/link/macho/stack_size/build.zig
index d7ea44b626..4210d9802d 100644
--- a/test/link/macho/stack_size/build.zig
+++ b/test/link/macho/stack_size/build.zig
@@ -20,7 +20,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
.optimize = optimize,
.target = target,
});
- exe.addCSourceFile("main.c", &.{});
+ exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &.{} });
exe.linkLibC();
exe.stack_size = 0x100000000;
diff --git a/test/link/macho/tls/build.zig b/test/link/macho/tls/build.zig
index 555fe207c5..443f698ea6 100644
--- a/test/link/macho/tls/build.zig
+++ b/test/link/macho/tls/build.zig
@@ -21,7 +21,7 @@ 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();
const test_exe = b.addTest(.{
diff --git a/test/link/macho/unwind_info/build.zig b/test/link/macho/unwind_info/build.zig
index c3b9d1ea4f..ead71b15d2 100644
--- a/test/link/macho/unwind_info/build.zig
+++ b/test/link/macho/unwind_info/build.zig
@@ -75,7 +75,7 @@ fn createScenario(
.target = target,
});
b.default_step.dependOn(&exe.step);
- exe.addIncludePath(".");
+ exe.addIncludePath(.{ .path = "." });
exe.addCSourceFiles(&[_][]const u8{
"main.cpp",
"simple_string.cpp",
diff --git a/test/link/macho/weak_framework/build.zig b/test/link/macho/weak_framework/build.zig
index 8069d62bd3..8a71584b25 100644
--- a/test/link/macho/weak_framework/build.zig
+++ b/test/link/macho/weak_framework/build.zig
@@ -18,7 +18,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
.name = "test",
.optimize = optimize,
});
- exe.addCSourceFile("main.c", &[0][]const u8{});
+ exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &[0][]const u8{} });
exe.linkLibC();
exe.linkFrameworkWeak("Cocoa");
diff --git a/test/link/macho/weak_library/build.zig b/test/link/macho/weak_library/build.zig
index 831a96e880..3d0819c19b 100644
--- a/test/link/macho/weak_library/build.zig
+++ b/test/link/macho/weak_library/build.zig
@@ -21,7 +21,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
.target = target,
.optimize = optimize,
});
- dylib.addCSourceFile("a.c", &.{});
+ dylib.addCSourceFile(.{ .file = .{ .path = "a.c" }, .flags = &.{} });
dylib.linkLibC();
b.installArtifact(dylib);
@@ -30,11 +30,11 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
.target = target,
.optimize = optimize,
});
- exe.addCSourceFile("main.c", &[0][]const u8{});
+ exe.addCSourceFile(.{ .file = .{ .path = "main.c" }, .flags = &[0][]const u8{} });
exe.linkLibC();
exe.linkSystemLibraryWeak("a");
- exe.addLibraryPathDirectorySource(dylib.getOutputDirectorySource());
- exe.addRPathDirectorySource(dylib.getOutputDirectorySource());
+ exe.addLibraryPath(dylib.getEmitDirectory());
+ exe.addRPath(dylib.getEmitDirectory());
const check = exe.checkObject();
check.checkStart();
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-27 22:49:28 +0000