Skip to content

Fix native paths https://github.com/ziglang/zig/pull/24193 #2369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix native paths https://github.com/ziglang/zig/pull/24193 #2369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3a1a0b
pass a const pointer to `NativePaths.detect`
leecannon Jun 22, 2025
d8f136d
flake.lock: Update
leecannon Jun 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const builtin = @import("builtin");
const zls_version: std.SemanticVersion = .{ .major = 0, .minor = 15, .patch = 0, .pre = "dev" };

/// Specify the minimum Zig version that is required to compile and test ZLS:
/// std.Build: resolved generated paths are cwd-relative
/// Target: pass and use locals by pointer instead of by value
///
/// If you do not use Nix, a ZLS maintainer can take care of this.
/// Whenever this version is increased, run the following command:
Expand All @@ -15,7 +15,7 @@ const zls_version: std.SemanticVersion = .{ .major = 0, .minor = 15, .patch = 0,
/// ```
///
/// Also update the `minimum_zig_version` in `build.zig.zon`.
const minimum_build_zig_version = "0.15.0-dev.631+9a3540d61";
const minimum_build_zig_version = "0.15.0-dev.864+75d0ec9c0";

/// Specify the minimum Zig version that is required to run ZLS:
/// Release 0.14.0
Expand Down
2 changes: 1 addition & 1 deletion build.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.version = "0.15.0-dev",
// Must be kept in line with the `minimum_build_zig_version` in `build.zig`.
// Should be a Zig version that is downloadable from https://ziglang.org/download/ or a mirror.
.minimum_zig_version = "0.15.0-dev.769+4d7980645",
.minimum_zig_version = "0.15.0-dev.864+75d0ec9c0",
// If you do not use Nix, a ZLS maintainer can take care of this.
// Whenever the dependencies are updated, run the following command:
// ```bash
Expand Down
12 changes: 6 additions & 6 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/DocumentStore.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1687,7 +1687,7 @@ pub fn collectIncludeDirs(
.ofmt = comptime std.Target.ObjectFormat.default(builtin.os.tag, builtin.cpu.arch),
.dynamic_linker = std.Target.DynamicLinker.none,
};
const native_paths: std.zig.system.NativePaths = try .detect(arena_allocator.allocator(), target_info);
const native_paths: std.zig.system.NativePaths = try .detect(arena_allocator.allocator(), &target_info);

try include_dirs.ensureUnusedCapacity(allocator, native_paths.include_dirs.items.len);
for (native_paths.include_dirs.items) |native_include_dir| {
Expand Down
Loading