andr3/zls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support 0.9.1 (#691)

Browse Source
This commit is contained in:
Lee Cannon 2022-09-29 20:48:37 +01:00 committed by GitHub
parent 32ce19f9a8
commit 3c4535a321
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/special/build_runner.zig
View File

@ -118,7 +118,10 @@ pub fn main() !void {
); );
} }
fn reifyOptions(step: *std.build.Step) !void { fn reifyOptions(step: *std.build.Step) anyerror!void {
// Support Zig 0.9.1
if (!@hasDecl(OptionsStep, "base_id")) return;
if (step.cast(OptionsStep)) |option| { if (step.cast(OptionsStep)) |option| {
// We don't know how costly the dependency tree might be, so err on the side of caution // We don't know how costly the dependency tree might be, so err on the side of caution
if (step.dependencies.items.len == 0) { if (step.dependencies.items.len == 0) {
@ -138,8 +141,8 @@ fn processStep(
step: *std.build.Step, step: *std.build.Step,
) anyerror!void { ) anyerror!void {
if (step.cast(InstallArtifactStep)) |install_exe| { if (step.cast(InstallArtifactStep)) |install_exe| {
if(install_exe.artifact.root_src) |src| { if (install_exe.artifact.root_src) |src| {
try packages.append(allocator, .{.name = "root", .path = src.path }); try packages.append(allocator, .{ .name = "root", .path = src.path });
} }
try processIncludeDirs(allocator, include_dirs, install_exe.artifact.include_dirs.items); try processIncludeDirs(allocator, include_dirs, install_exe.artifact.include_dirs.items);
@ -148,8 +151,8 @@ fn processStep(
try processPackage(allocator, packages, pkg); try processPackage(allocator, packages, pkg);
} }
} else if (step.cast(LibExeObjStep)) |exe| { } else if (step.cast(LibExeObjStep)) |exe| {
if(exe.root_src) |src| { if (exe.root_src) |src| {
try packages.append(allocator, .{.name = "root", .path = src.path }); try packages.append(allocator, .{ .name = "root", .path = src.path });
} }
try processIncludeDirs(allocator, include_dirs, exe.include_dirs.items); try processIncludeDirs(allocator, include_dirs, exe.include_dirs.items);
try processPkgConfig(allocator, include_dirs, exe); try processPkgConfig(allocator, include_dirs, exe);
@ -172,7 +175,9 @@ fn processPackage(
if (std.mem.eql(u8, package.name, pkg.name)) return; if (std.mem.eql(u8, package.name, pkg.name)) return;
} }
// Support Zig 0.9.1
const source = if (@hasField(std.build.Pkg, "source")) pkg.source else pkg.path; const source = if (@hasField(std.build.Pkg, "source")) pkg.source else pkg.path;
const maybe_path = switch (source) { const maybe_path = switch (source) {
.path => |path| path, .path => |path| path,
.generated => |generated| generated.path, .generated => |generated| generated.path,
@ -216,6 +221,9 @@ fn processPkgConfig(
if (link_object != .system_lib) continue; if (link_object != .system_lib) continue;
const system_lib = link_object.system_lib; const system_lib = link_object.system_lib;
// Support Zig 0.9.1
if (@TypeOf(system_lib) == []const u8) return;
if (system_lib.use_pkg_config == .no) continue; if (system_lib.use_pkg_config == .no) continue;
getPkgConfigIncludes(allocator, include_dirs, exe, system_lib.name) catch |err| switch (err) { getPkgConfigIncludes(allocator, include_dirs, exe, system_lib.name) catch |err| switch (err) {