Skip to content

slightly better error on host lib missing #8320

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

Open
bhansconnect wants to merge 1 commit into
base: main
Choose a base branch
from
Open

slightly better error on host lib missing #8320

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions src/cli/main.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,14 @@ fn rocRun(allocs: *Allocators, args: cli_args.RunArgs) void {
// Resolve platform paths from the platform spec (relative to app file directory)
const app_dir = std.fs.path.dirname(args.path) orelse ".";
const platform_paths = resolvePlatformSpecToPaths(allocs, platform_spec, app_dir) catch |err| {
std.log.err("Failed to resolve platform spec '{s}': {}", .{ platform_spec, err });
switch (err) {
error.HostLibMissing => {
std.log.err("Failed to find platform host lib. Is the platform compiled?", .{});
},
else => {
std.log.err("Failed to resolve platform spec '{s}': {}", .{ platform_spec, err });
},
}
std.process.exit(1);
};

Expand Down Expand Up @@ -1601,7 +1608,7 @@ fn extractPlatformSpecFromApp(allocs: *Allocators, app_file_path: []const u8) ![
}

/// Resolve a platform specification to both host library and platform source paths
fn resolvePlatformSpecToPaths(allocs: *Allocators, platform_spec: []const u8, base_dir: []const u8) (std.mem.Allocator.Error || error{PlatformNotSupported})!PlatformPaths {
fn resolvePlatformSpecToPaths(allocs: *Allocators, platform_spec: []const u8, base_dir: []const u8) (std.mem.Allocator.Error || error{ PlatformNotSupported, HostLibMissing })!PlatformPaths {

// Check for common platform names and map them to host libraries
if (std.mem.eql(u8, platform_spec, "cli")) {
Expand Down Expand Up @@ -1701,7 +1708,7 @@ fn resolvePlatformSpecToPaths(allocs: *Allocators, platform_spec: []const u8, ba
const host_path = try std.fs.path.join(allocs.arena, &.{ platform_dir, host_filename });

std.fs.cwd().access(host_path, .{}) catch {
return error.PlatformNotSupported;
return error.HostLibMissing;
};

return PlatformPaths{
Expand Down
Loading