authorgravatar for luuk@degram.devLuuk de Gram <luuk@degram.dev> 2022-08-21 16:42:11+02:00
committergravatar for luuk@degram.devLuuk de Gram <luuk@degram.dev> 2022-08-21 16:42:11+02:00
logd4c56804dfd3f53de1f0950fac9478b096a2a0b4
tree0114e0e0bc96c35aedde183d15d74f404ead1bff
parent7fe2a3d104319835127456d02ba73efc5fe5f207
signaturelock-open Commit is signed but in an unrecognized format.

std: fix EmulatableRunStep

Fixes a compilation error when using the `EmulatableRunStep` that is being generated from a step directly using `runEmulatable`.

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

lib/std/build.zig+5-1
...@@ -1898,7 +1898,11 @@ pub const LibExeObjStep = struct {...@@ -1898,7 +1898,11 @@ pub const LibExeObjStep = struct {
1898 pub fn runEmulatable(exe: *LibExeObjStep) *EmulatableRunStep {1898 pub fn runEmulatable(exe: *LibExeObjStep) *EmulatableRunStep {
1899 assert(exe.kind == .exe or exe.kind == .test_exe);1899 assert(exe.kind == .exe or exe.kind == .test_exe);
19001900
1901 return EmulatableRunStep.create(exe.builder, exe.builder.fmt("run {s}", .{exe.step.name}), exe);1901 const run_step = EmulatableRunStep.create(exe.builder, exe.builder.fmt("run {s}", .{exe.step.name}), exe);
1902 if (exe.vcpkg_bin_path) |path| {
1903 RunStep.addPathDirInternal(&run_step.step, exe.builder, path);
1904 }
1905 return run_step;
1902 }1906 }
19031907
1904 pub fn checkObject(self: *LibExeObjStep, obj_format: std.Target.ObjectFormat) *CheckObjectStep {1908 pub fn checkObject(self: *LibExeObjStep, obj_format: std.Target.ObjectFormat) *CheckObjectStep {
lib/std/build/RunStep.zig+1-1
...@@ -101,7 +101,7 @@ pub fn addPathDir(self: *RunStep, search_path: []const u8) void {...@@ -101,7 +101,7 @@ pub fn addPathDir(self: *RunStep, search_path: []const u8) void {
101}101}
102102
103/// For internal use only, users of `RunStep` should use `addPathDir` directly.103/// For internal use only, users of `RunStep` should use `addPathDir` directly.
104fn addPathDirInternal(step: *Step, builder: *Builder, search_path: []const u8) void {104pub fn addPathDirInternal(step: *Step, builder: *Builder, search_path: []const u8) void {
105 const env_map = getEnvMapInternal(step, builder.allocator);105 const env_map = getEnvMapInternal(step, builder.allocator);
106106
107 const key = "PATH";107 const key = "PATH";