Temporarily make Aro a normal dependency.

See: #16
vezel-dev · Jun 16, 2024 · 662bf28 · 662bf28
1 parent 9550c17
commit 662bf28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/build.zig b/build.zig
@@ -100,14 +100,11 @@ pub fn build(b: *std.Build) anyerror!void {
         .optimize = optimize_opt,
     }).module("mecha"));
 
-    if (!disable_aro_opt) {
-        if (b.lazyDependency("aro", .{
-            .target = target_opt,
-            .optimize = optimize_opt,
-        })) |dep| {
-            graf_mod.addImport("aro", dep.module("aro"));
-        }
-    }
+    // TODO: Aro should be a lazy dependency, but this causes HTTP problems on macOS.
+    graf_mod.addImport("aro", b.dependency("aro", .{
+        .target = target_opt,
+        .optimize = optimize_opt,
+    }).module("aro"));
 
     install_step.dependOn(&b.addInstallHeaderFile(b.path(b.pathJoin(&.{ "inc", "graf.h" })), "graf.h").step);
 

diff --git a/build.zig.zon b/build.zig.zon
@@ -9,7 +9,6 @@
         .aro = .{
             .url = "https://github.com/Vexu/arocc/archive/8a885d8f6b65c6ed44d56a9f51e0401d76e6940d.tar.gz",
             .hash = "1220924a9c1a1762d06d8b0b33ce6c3edf0c3ec4beef1be14177fdc1aaeba301ee03",
-            .lazy = true,
         },
         .clap = .{
             .url = "https://github.com/Hejsil/zig-clap/archive/7a51c11319b3892b81784149fb2cb2915073710c.tar.gz",