Clean up out-of-tree Zirgen use

risc0 · Dec 17, 2024 · 94a41c5 · 94a41c5
1 parent dabc247
commit 94a41c5
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 33 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -1,19 +1,11 @@
 workspace(name = "zirgen")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
-http_archive(
-    name = "bazel_skylib",
-    sha256 = "74d544d96f4a5bb630d465ca8bbcfe231e3594e5aae57e1edbf17a6eb3ca2506",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz",
-        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.3.0.tar.gz",
-    ],
-)
+load("//bazel/rules/zirgen:deps.bzl", "zirgen_dependencies")
+zirgen_dependencies()
 
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
-
 bazel_skylib_workspace()
 
 LLVM_COMMIT = "fea7b65f23632b42ff8f7e2595ac0641e2c1d214"
@@ -29,31 +21,8 @@ http_archive(
 )
 
 load("@llvm-raw//utils/bazel:configure.bzl", "llvm_configure")
-
 llvm_configure(name = "llvm-project")
 
-maybe(
-    http_archive,
-    name = "llvm_zlib",
-    build_file = "@llvm-raw//utils/bazel/third_party_build:zlib-ng.BUILD",
-    sha256 = "e36bb346c00472a1f9ff2a0a4643e590a254be6379da7cddd9daeb9a7f296731",
-    strip_prefix = "zlib-ng-2.0.7",
-    urls = [
-        "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.0.7.zip",
-    ],
-)
-
-maybe(
-    http_archive,
-    name = "llvm_zstd",
-    build_file = "@llvm-raw//utils/bazel/third_party_build:zstd.BUILD",
-    sha256 = "7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0",
-    strip_prefix = "zstd-1.5.2",
-    urls = [
-        "https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz",
-    ],
-)
-
 load("//bazel/toolchain/risc0:repo.bzl", "risc0_toolchain")
 
 risc0_toolchain(name = "risc0_toolchain")

diff --git a/bazel/rules/zirgen/deps.bzl b/bazel/rules/zirgen/deps.bzl
@@ -0,0 +1,63 @@
+"""
+Utility to resolve Zirgen compiler dependencies
+"""
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+
+def zirgen_dependencies():
+    """
+    Resolve Zirgen compiler dependencies.
+
+    usage:
+    ```
+    load("//bazel/rules/zirgen:deps.bzl", "zirgen_dependencies")
+    zirgen_dependencies()
+
+    load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+    bazel_skylib_workspace()
+
+    load("@llvm-raw//utils/bazel:configure.bzl", "llvm_configure")
+    llvm_configure(name = "llvm-project")
+    ```
+    """
+    http_archive(
+        name = "bazel_skylib",
+        sha256 = "74d544d96f4a5bb630d465ca8bbcfe231e3594e5aae57e1edbf17a6eb3ca2506",
+        urls = [
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz",
+            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.3.0.tar.gz",
+        ],
+    )
+
+    LLVM_COMMIT = "0d72fe9777e7c131dfb50c172b944d64437e2ece"
+    LLVM_SHA256 = "41f69c116fd1e25d290031c408f6ea0246cafb993b1fdab6f781c87fc0b903cf"
+    http_archive(
+        name = "llvm-raw",
+        build_file_content = "# empty",
+        sha256 = LLVM_SHA256,
+        strip_prefix = "llvm-project-" + LLVM_COMMIT,
+        urls = ["https://github.com/llvm/llvm-project/archive/{commit}.tar.gz".format(commit = LLVM_COMMIT)],
+    )
+
+    maybe(
+        http_archive,
+        name = "llvm_zlib",
+        build_file = "@llvm-raw//utils/bazel/third_party_build:zlib-ng.BUILD",
+        sha256 = "e36bb346c00472a1f9ff2a0a4643e590a254be6379da7cddd9daeb9a7f296731",
+        strip_prefix = "zlib-ng-2.0.7",
+        urls = [
+            "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.0.7.zip",
+        ],
+    )
+
+    maybe(
+        http_archive,
+        name = "llvm_zstd",
+        build_file = "@llvm-raw//utils/bazel/third_party_build:zstd.BUILD",
+        sha256 = "7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0",
+        strip_prefix = "zstd-1.5.2",
+        urls = [
+            "https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz",
+        ],
+    )