summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNic Gaffney <gaffney_nic@protonmail.com>2024-08-08 20:01:10 -0500
committerNic Gaffney <gaffney_nic@protonmail.com>2024-08-08 20:01:10 -0500
commit013086f9c55e33f7bfcfd775c8b9d03fb2311de4 (patch)
tree9b2bc0851b0d0f642f86e5913e2b51bd2d3f4289
parentf6c44ace2fc54d2491b341440f78c2894909018f (diff)
downloadcalico-013086f9c55e33f7bfcfd775c8b9d03fb2311de4.tar.gz
Fixed build.zig
-rw-r--r--build.zig22
-rw-r--r--build.zig.zon4
2 files changed, 4 insertions, 22 deletions
diff --git a/build.zig b/build.zig
index 4aacbf2..e8b9c5e 100644
--- a/build.zig
+++ b/build.zig
@@ -12,27 +12,11 @@ pub fn build(b: *std.Build) !void {
.optimize = optimize,
});
- const lib = b.addStaticLibrary(.{
- .name = "llvm",
- .root_source_file = b.path("lib/llvm-zig/src/llvm.zig"),
- .target = target,
- .optimize = optimize,
- });
- lib.defineCMacro("_FILE_OFFSET_BITS", "64");
- lib.defineCMacro("__STDC_CONSTANT_MACROS", null);
- lib.defineCMacro("__STDC_FORMAT_MACROS", null);
- lib.defineCMacro("__STDC_LIMIT_MACROS", null);
- lib.linkSystemLibrary("z");
- lib.linkLibC();
- lib.linkSystemLibrary("LLVM-17");
+ const llvm = b.dependency("llvm-zig", .{});
+ exe.root_module.addImport("llvm", llvm.module("llvm"));
b.installArtifact(exe);
- b.installArtifact(lib);
-
- _ = try b.modules.put("llvm", &lib.root_module);
- exe.root_module.addImport("llvm", b.modules.get("llvm").?);
-
const run_cmd = b.addRunArtifact(exe);
run_cmd.step.dependOn(b.getInstallStep());
@@ -68,8 +52,6 @@ pub fn build(b: *std.Build) !void {
.optimize = optimize,
});
- codegen_unit_tests.root_module.addImport("llvm", &lib.root_module);
-
const run_exe_unit_tests = b.addRunArtifact(exe_unit_tests);
const run_token_unit_tests = b.addRunArtifact(token_unit_tests);
const run_parse_unit_tests = b.addRunArtifact(parse_unit_tests);
diff --git a/build.zig.zon b/build.zig.zon
index 44e2548..5e77e74 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -4,8 +4,8 @@
.dependencies = .{
.@"llvm-zig" = .{
- .url = "lib/llvm-zig/",
- .hash = "12207a7060e770193b2b894d2259b961f25d9ab04c03d69bcb0485c782b1b34b2200",
+ .url = "https://github.com/dwclake/llvm-zig/archive/refs/heads/main.zip",
+ .hash = "12203b7d504abd379ca74e8768f3d58bf6c2cff58dd75a5c55740b1945f2be8356f0",
},
},
.paths = .{