From a361f807a95d8601b9730e8c15233b6b2a4d312d Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Thu, 31 Mar 2022 16:57:40 +0000 Subject: [PATCH] gpu-dawn: fix error when curl is unavailable / not installed Fixes hexops/mach#197 Signed-off-by: Stephen Gutekanst --- gpu-dawn/build.zig | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gpu-dawn/build.zig b/gpu-dawn/build.zig index a8f52e2d..ce4c0c93 100644 --- a/gpu-dawn/build.zig +++ b/gpu-dawn/build.zig @@ -313,7 +313,7 @@ fn downloadBinary( is_windows: bool, version: []const u8, ) !void { - try ensureCanDownloadFiles(allocator); + ensureCanDownloadFiles(allocator); const download_dir = try std.fs.path.join(allocator, &.{ target_cache_dir, "download" }); try std.fs.cwd().makePath(download_dir); @@ -454,7 +454,10 @@ fn ensureCanDownloadFiles(allocator: std.mem.Allocator) !void { .allocator = allocator, .argv = argv, .cwd = thisDir(), - }); + }) catch { // e.g. FileNotFound + std.log.err("mach: error: 'curl --version' failed. Is curl not installed?", .{}); + std.process.exit(1); + }; defer { allocator.free(result.stderr); allocator.free(result.stdout);