motiejus/zig
1
Fork 0
Code Releases Activity

fix std.Build.TranslateCStep

Browse Source
This commit is contained in:
Andrew Kelley
2023-03-01 00:34:30 -07:00
parent 0e078790fe
commit 8b2d872020
3 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/std/Build.zig
View File

@@ -1453,7 +1453,7 @@ pub fn execFromStep(b: *Build, argv: []const []const u8, s: *Step, prog_node: *s
const header = @ptrCast(*align(1) const Header, buf[0..@sizeOf(Header)]);
const header_and_msg_len = header.bytes_len + @sizeOf(Header);
if (buf.len >= header_and_msg_len) {
const body = buf[@sizeOf(Header)..];
const body = buf[@sizeOf(Header)..][0..header.bytes_len];
switch (header.tag) {
.zig_version => {
if (!mem.eql(u8, builtin.zig_version_string, body)) {

4
lib/std/Build/TranslateCStep.zig
View File

@@ -97,6 +97,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
try argv_list.append("-lc");
try argv_list.append("--enable-cache");
try argv_list.append("--listen=-");
if (!self.target.isNative()) {
try argv_list.append("-target");
@@ -120,8 +121,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
try argv_list.append(self.source.getPath(self.builder));
const output_path_nl = try self.builder.execFromStep(argv_list.items, &self.step, prog_node);
const output_path = mem.trimRight(u8, output_path_nl, "\r\n");
const output_path = try self.builder.execFromStep(argv_list.items, &self.step, prog_node);
self.out_basename = fs.path.basename(output_path);
const output_dir = fs.path.dirname(output_path).?;