Package compiler-rt for linux. Fix LLVM version.

Author: calebzulawski

.github/workflows/build-toolchain.yml

@@ -135,15 +135,18 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           pattern: gcc-*
+      - name: Extract gcc
+        run: find . -name "gcc-*.tar" -exec tar -xf {} \;
       - name: Build llvm
-        run: |
-          find . -name "gcc-*.tar" -exec tar -xf {} \;
-          cd toolchain && bazel build //${{ matrix.target.type }}:llvm-package
+        run: cd toolchain && bazel build //${{ matrix.target.type }}:llvm-package
+      - name: Build compiler-rt
+        run: cd toolchain && bazel build //${{ matrix.target.type }}:compiler-rt-package
+        if: ${{ contains(matrix.target.name, 'linux') }}
       - name: Upload built llvm
         uses: actions/upload-artifact@v4
         with:
           name: llvm-${{ matrix.target.name }}
-          path: toolchain/bazel-bin/${{ matrix.target.type }}/llvm-*.tar.xz
+          path: toolchain/bazel-bin/${{ matrix.target.type }}/*.tar.xz
           if-no-files-found: error
 
   test-bazel-rules:

toolchain/MODULE.bazel

@@ -13,15 +13,12 @@ http_archive(
     name = "llvm-project",
     build_file_content = 'filegroup(name = "llvm-project", srcs = glob(["**/*"]), visibility = ["//visibility:public"])',
     integrity = "sha256-gkAf6nt50AeAQ/dZi4NShNZlCnW5PmS292Hqe2MJdQE=",
-    # integrity = "sha256-WKiBjGDmYnBk8xLb9GwC2ZSZVlWDQJOLcc9zGti8CBM=",
     patch_args = ["-p1"],
     patches = [
         "//:patches/50611.patch",
     ],
     strip_prefix = "llvm-project-19.1.7.src",
     url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.7/llvm-project-19.1.7.src.tar.xz",
-    # strip_prefix = "llvm-project-17.0.6.src",
-    # url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz",
 )
 
 http_archive(
@@ -33,3 +30,7 @@ http_archive(
 )
 
 rules_foreign_cc_toolchains = use_extension("rules_foreign_cc.bzl", "rules_foreign_cc_toolchains")
+
+llvm_version = use_repo_rule("//:llvm_version.bzl", "llvm_version")
+
+llvm_version(name = "llvm_version")

toolchain/linux/BUILD

@@ -1,14 +1,13 @@
 load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory")
 load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
+load("@llvm_version//:llvm_version.bzl", "LLVM_VERSION")
 load("//:cmake.bzl", "cmake")
 load("//:config.bzl", "LINUX_TARGETS")
 load("//:host.bzl", "HOST_TARGET")
 load("//:tar.bzl", "tar_package")
 
 package(default_visibility = ["//visibility:public"])
 
-LLVM_VERSION = "17.0.6"
-
 # The following targets are built for each target
 [
     (
@@ -114,23 +113,41 @@ cmake(
     lib_source = "@zlib",
 )
 
+ALL_COMPILER_RT_SRCS = ["compiler-rt-{}".format(target) for target in LINUX_TARGETS]
+
+COMPILER_RT_PREFIX = {
+    "**/compiler-rt-*": "lib/clang/" + LLVM_VERSION.split(".")[0],
+}
+
 # Add compiler-rt to LLVM installation
 copy_to_directory(
     name = "llvm",
-    srcs = ["//:llvm"] + ["compiler-rt-{}".format(target) for target in LINUX_TARGETS],
+    srcs = ["//:llvm"] + ALL_COMPILER_RT_SRCS,
     allow_overwrites = True,
-    replace_prefixes = {
-        "**/compiler-rt-*": "lib/clang/" + LLVM_VERSION.split(".")[0],
-    },
+    replace_prefixes = COMPILER_RT_PREFIX,
     root_paths = [
         "llvm",
         ".",
     ],
 )
 
+# Make standalone compiler-rt for macOS hosts
+copy_to_directory(
+    name = "compiler-rt",
+    srcs = ALL_COMPILER_RT_SRCS,
+    allow_overwrites = True,
+    replace_prefixes = COMPILER_RT_PREFIX,
+)
+
 # Package the compiler into a tar
 tar_package(
     "llvm-package",
     "llvm-{}".format(HOST_TARGET),
     "llvm",
 )
+
+tar_package(
+    "compiler-rt-package",
+    "compiler-rt-linux",
+    "compiler-rt",
+)

toolchain/llvm_version.bzl

@@ -0,0 +1,17 @@
+def _llvm_version(rctx):
+    config = rctx.read(Label("@llvm-project//:libcxx/include/__config"))
+    prefix = "define _LIBCPP_VERSION"
+    version = None
+    for line in config.splitlines():
+        if prefix in line:
+            version = line.split(prefix)[1].strip()
+
+    if version == None:
+        fail("couldn't identify LLVM version")
+
+    rctx.file("llvm_version.bzl", 'LLVM_VERSION = "{}.{}.{}"'.format(version[0:2], version[2:4].removeprefix("0"), version[4:6].removeprefix("0")))
+    rctx.file("BUILD", 'exports_files(["llvm_version.bzl"])')
+
+llvm_version = repository_rule(
+    implementation = _llvm_version,
+)