Merge pull request ziglang#22511 from apwadkar/master

Fix compiler errors in std.process and std.Build.Step.Compile
Fri3dNstuff · Jan 21, 2025 · 0d6b17b · 0d6b17b
2 parents 0ec6b2d + 23facb6
commit 0d6b17b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/std/Build/Step/Compile.zig b/lib/std/Build/Step/Compile.zig
@@ -610,7 +610,7 @@ pub fn forceUndefinedSymbol(compile: *Compile, symbol_name: []const u8) void {
 
 /// Returns whether the library, executable, or object depends on a particular system library.
 /// Includes transitive dependencies.
-pub fn dependsOnSystemLibrary(compile: *const Compile, name: []const u8) bool {
+pub fn dependsOnSystemLibrary(compile: *Compile, name: []const u8) bool {
     var is_linking_libc = false;
     var is_linking_libcpp = false;
 
@@ -622,8 +622,8 @@ pub fn dependsOnSystemLibrary(compile: *const Compile, name: []const u8) bool {
                     else => {},
                 }
             }
-            if (mod.link_libc) is_linking_libc = true;
-            if (mod.link_libcpp) is_linking_libcpp = true;
+            if (mod.link_libc orelse false) is_linking_libc = true;
+            if (mod.link_libcpp orelse false) is_linking_libcpp = true;
         }
     }
 

diff --git a/lib/std/process.zig b/lib/std/process.zig
@@ -15,7 +15,7 @@ pub const Child = @import("process/Child.zig");
 pub const abort = posix.abort;
 pub const exit = posix.exit;
 pub const changeCurDir = posix.chdir;
-pub const changeCurDirC = posix.chdirC;
+pub const changeCurDirZ = posix.chdirZ;
 
 pub const GetCwdError = posix.GetCwdError;