Skip to content

Commit 0d6b17b

Browse files
authored
Merge pull request #22511 from apwadkar/master
Fix compiler errors in std.process and std.Build.Step.Compile
2 parents 0ec6b2d + 23facb6 commit 0d6b17b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/std/Build/Step/Compile.zig

+3-3
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ pub fn forceUndefinedSymbol(compile: *Compile, symbol_name: []const u8) void {
610610

611611
/// Returns whether the library, executable, or object depends on a particular system library.
612612
/// Includes transitive dependencies.
613-
pub fn dependsOnSystemLibrary(compile: *const Compile, name: []const u8) bool {
613+
pub fn dependsOnSystemLibrary(compile: *Compile, name: []const u8) bool {
614614
var is_linking_libc = false;
615615
var is_linking_libcpp = false;
616616

@@ -622,8 +622,8 @@ pub fn dependsOnSystemLibrary(compile: *const Compile, name: []const u8) bool {
622622
else => {},
623623
}
624624
}
625-
if (mod.link_libc) is_linking_libc = true;
626-
if (mod.link_libcpp) is_linking_libcpp = true;
625+
if (mod.link_libc orelse false) is_linking_libc = true;
626+
if (mod.link_libcpp orelse false) is_linking_libcpp = true;
627627
}
628628
}
629629

lib/std/process.zig

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub const Child = @import("process/Child.zig");
1515
pub const abort = posix.abort;
1616
pub const exit = posix.exit;
1717
pub const changeCurDir = posix.chdir;
18-
pub const changeCurDirC = posix.chdirC;
18+
pub const changeCurDirZ = posix.chdirZ;
1919

2020
pub const GetCwdError = posix.GetCwdError;
2121

0 commit comments

Comments
 (0)