mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-13 12:59:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.Build.Step.Compile: fix clearing logic for empty cflags

Browse Source 
Commit c0b774fbc65e3e406a38d37b02fffda7c5d3df26 originally added this
logic but it did not properly clear the C command line flags to empty
when a previous positional argument had command line flags, because it
never set the "previous" flag to true.

This fixes C compiler flags not being reset to empty when using the
build system and a second positional argument has no arguments after a
first positional argument has arguments.

Thanks to @squeek502 for finding this.
This commit is contained in:
Andrew Kelley 2023-07-03 21:47:57 -07:00
parent d3eaa75c07
commit 8ae92fd17e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/std/Build/Step/Compile.zig
View File

@ -1344,7 +1344,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
try transitive_deps.seen_steps.put(&self.step, {});
try transitive_deps.add(self.link_objects.items);
var prev_has_extra_flags = false;
var prev_has_cflags = false;
for (transitive_deps.link_objects.items) |link_object| {
switch (link_object) {
@ -1413,20 +1413,20 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
},
.assembly_file => |asm_file| {
if (prev_has_extra_flags) {
try zig_args.append("-extra-cflags");
if (prev_has_cflags) {
try zig_args.append("-cflags");
try zig_args.append("--");
prev_has_extra_flags = false;
prev_has_cflags = false;
}
try zig_args.append(asm_file.getPath(b));
},
.c_source_file => |c_source_file| {
if (c_source_file.args.len == 0) {
if (prev_has_extra_flags) {
if (prev_has_cflags) {
try zig_args.append("-cflags");
try zig_args.append("--");
prev_has_extra_flags = false;
prev_has_cflags = false;
}
} else {
try zig_args.append("-cflags");
@ -1434,16 +1434,17 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
try zig_args.append(arg);
}
try zig_args.append("--");
prev_has_cflags = true;
}
try zig_args.append(c_source_file.source.getPath(b));
},
.c_source_files => |c_source_files| {
if (c_source_files.flags.len == 0) {
if (prev_has_extra_flags) {
if (prev_has_cflags) {
try zig_args.append("-cflags");
try zig_args.append("--");
prev_has_extra_flags = false;
prev_has_cflags = false;
}
} else {
try zig_args.append("-cflags");
@ -1451,6 +1452,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
try zig_args.append(flag);
}
try zig_args.append("--");
prev_has_cflags = true;
}
for (c_source_files.files) |file| {
try zig_args.append(b.pathFromRoot(file));