authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-01-20 22:02:38-05:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-01-20 22:02:38-05:00
log0d6b17b6a5cd4d179417f8a13302558b05f1f2ca
tree6176967ff424025f12d67903e8528866f15a8d1d
parent0ec6b2dd883568900aa28dd5fea6d22258eed792
parent23facb6a16ca1b0684d1f3eab1b932c3bf78e5ce
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #22511 from apwadkar/master

Fix compiler errors in std.process and std.Build.Step.Compile

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

lib/std/Build/Step/Compile.zig+3-3
...@@ -610,7 +610,7 @@ pub fn forceUndefinedSymbol(compile: *Compile, symbol_name: []const u8) void {...@@ -610,7 +610,7 @@ pub fn forceUndefinedSymbol(compile: *Compile, symbol_name: []const u8) void {
610610
611/// Returns whether the library, executable, or object depends on a particular system library.611/// Returns whether the library, executable, or object depends on a particular system library.
612/// Includes transitive dependencies.612/// Includes transitive dependencies.
613pub fn dependsOnSystemLibrary(compile: *const Compile, name: []const u8) bool {613pub fn dependsOnSystemLibrary(compile: *Compile, name: []const u8) bool {
614 var is_linking_libc = false;614 var is_linking_libc = false;
615 var is_linking_libcpp = false;615 var is_linking_libcpp = false;
616616
...@@ -622,8 +622,8 @@ pub fn dependsOnSystemLibrary(compile: *const Compile, name: []const u8) bool {...@@ -622,8 +622,8 @@ pub fn dependsOnSystemLibrary(compile: *const Compile, name: []const u8) bool {
622 else => {},622 else => {},
623 }623 }
624 }624 }
625 if (mod.link_libc) is_linking_libc = true;625 if (mod.link_libc orelse false) is_linking_libc = true;
626 if (mod.link_libcpp) is_linking_libcpp = true;626 if (mod.link_libcpp orelse false) is_linking_libcpp = true;
627 }627 }
628 }628 }
629629
lib/std/process.zig+1-1
...@@ -15,7 +15,7 @@ pub const Child = @import("process/Child.zig");...@@ -15,7 +15,7 @@ pub const Child = @import("process/Child.zig");
15pub const abort = posix.abort;15pub const abort = posix.abort;
16pub const exit = posix.exit;16pub const exit = posix.exit;
17pub const changeCurDir = posix.chdir;17pub const changeCurDir = posix.chdir;
18pub const changeCurDirC = posix.chdirC;18pub const changeCurDirZ = posix.chdirZ;
1919
20pub const GetCwdError = posix.GetCwdError;20pub const GetCwdError = posix.GetCwdError;
2121