refactor: improve toolchain structure (#31)

Author: alexbatashev

cpp/extension.bzl

@@ -1,4 +1,4 @@
-load("//cpp:repositories.bzl", "download_llvm")
+load("//cpp/private/llvm:download.bzl", "download_llvm")
 
 def _init_toolchain(ctx):
     for mod in ctx.modules:

cpp/private/actions/compile.bzl

@@ -40,6 +40,7 @@ def _cpp_compile_impl(ctx, sources, headers, includes, modules, features, toolch
             features = features,
             include_directories = includes,
             extra_vars = extra_vars,
+            action_name = action_name,
         )
 
         ctx.actions.run(

cpp/private/common.bzl

@@ -55,6 +55,7 @@ def create_compilation_context(ctx, headers = [], is_aspect = False):
     Args:
         ctx: rule context
         headers: optional list of Files with target headers
+        is_aspect: True if this function is called from an aspect
 
     Returns:
         A structure containing compilation context

cpp/private/llvm.BUILD

@@ -1,44 +1,46 @@
-load("@rules_cpp//cpp:rules.bzl", "declare_clang_toolchains")
-load("@rules_cpp//cpp/private:tool.bzl", "tool")
+load("@rules_cpp//cpp:rules.bzl", 
+  "declare_clang_toolchains",
+  "compiler",
+  "standard_library",
+  "binutils",
+  "linker",
+)
 
 filegroup(
-  name = "clang-files",
+  name = "openmp",
   srcs = glob([
-    "bin/clang*",
-    "lib/clang/**/*",
-    "lib/*LTO*",
+    "lib/*omp*",
   ]),
   visibility = ["//visibility:public"],
 )
 
 filegroup(
-  name = "binutils",
+  name = "clang-files",
   srcs = glob([
-    "bin/llvm-objcopy*",
-    "bin/llvm-dwp*",
-    "bin/llvm-cov*",
-    "bin/llvm-strip*",
-    "bin/llvm-nm*",
-    "bin/llvm-ar*",
-    "bin/llvm-strings*",
+    "bin/clang*",
+    "lib/clang/**/*",
+    "lib/*LTO*",
+    "lib/libclang*",
+    "lib/libLLVM*",
   ]),
-  visibility = ["//visibility:public"],
 )
 
-tool(
-  name = "strip",
-  executable = "bin/llvm-strip",
-)
-
-tool(
-  name = "ar",
-  executable = "bin/llvm-ar",
+compiler(
+  name = "clang",
+  kind = "clang",
+  binary = "bin/clang",
+  deps = [":clang-files", ":openmp"]
 )
 
-filegroup(
-  name = "openmp",
-  srcs = glob([
-    "lib/*omp*",
+binutils(
+  name = "binutils",
+  ar = "bin/llvm-ar",
+  assembler = "bin/clang",
+  objcopy = "bin/llvm-objcopy",
+  strip = "bin/llvm-strip",
+  dwp = "bin/llvm-dwp",
+  deps = glob([
+    "bin/llvm-*",
   ]),
   visibility = ["//visibility:public"],
 )
@@ -52,54 +54,40 @@ filegroup(
   visibility = ["//visibility:public"],
 )
 
-tool(
+linker(
   name = "lld",
-  executable = "bin/lld",
+  kind = "lld",
+  binary = "bin/ld.lld",
+  deps = [":lld-files"],
   visibility = ["//visibility:public"],
-  data = [":lld-files"]
 )
 
-filegroup(
+standard_library(
   name = "libc++",
-  srcs = glob([
+  kind = "libc++",
+  headers = glob([
     "include/c++/**/*",
     "include/x86_64-unknown-linux-gnu/**/*",
-    "lib/*c++*",
   ]),
-  visibility = ["//visibility:public"],
-)
-
-filegroup(
-  name = "static_libc++",
-  srcs = glob([
+  shared_libraries = glob([
+    "lib/**/*c++*.so",
+    "lib/**/*c++*.dylib",
+  ]),
+  static_libraries = glob([
     "lib/**/libc++.a",
     "lib/**/libc++abi.a",
     "lib/**/libunwind.a",
   ]),
-  visibility = ["//visibility:public"],
-)
-
-tool(
-  name = "clang",
-  executable = "bin/clang",
-  data = [
-    ":clang-files",
-    ":binutils",
-    ":openmp",
-    ":lld",
-    ":libc++",
-    ":static_libc++",
-  ],
-  visibility = ["//visibility:public"],
+  includes = [
+      "include/c++/v1",
+      "include/x86_64-unknown-linux-gnu/c++/v1",
+  ]
 )
 
 declare_clang_toolchains(
   name = "toolchain",
   compiler = ":clang",
   linker = ":lld",
   stdlib = ":libc++",
-  static_stdlib = ":static_libc++",
   binutils = ":binutils",
-  strip = ":strip",
-  archiver = ":ar",
 )

cpp/private/llvm/BUILD.bazel

@@ -0,0 +1,34 @@
+"""Utilities for downloading LLVM toolchains"""
+
+load(
+    "@bazel_tools//tools/build_defs/repo:http.bzl",
+    "http_archive",
+)
+load("//cpp/private/llvm:releases_aarch64_darwin.bzl", "llvm_aarch64_darwin")
+load("//cpp/private/llvm:releases_x64_darwin.bzl", "llvm_x64_darwin")
+load("//cpp/private/llvm:releases_x64_linux.bzl", "llvm_x64_linux")
+
+def download_llvm(mctx, repo_name, version):
+    """Download entire LLVM toolchain
+
+    Args:
+        mctx: module context
+        repo_name: name of the repository that'll be made available to the user
+        version: either main or a supporter released LLVM version
+    """
+
+    clang_repo = {}
+    if mctx.os.name == "linux" and mctx.os.arch == "amd64":
+        clang_repo = llvm_x64_linux
+    elif mctx.os.name == "mac os x" and mctx.os.arch == "aarch64":
+        clang_repo = llvm_aarch64_darwin
+    elif mctx.os.name == "mac os x" and mctx.os.arch == "x86_64":
+        clang_repo = llvm_x64_darwin
+
+    http_archive(
+        name = repo_name,
+        urls = clang_repo[version]["urls"],
+        strip_prefix = clang_repo[version]["strip_prefix"],
+        sha256 = clang_repo[version]["sha256"],
+        build_file = "//cpp/private:llvm.BUILD",
+    )

cpp/private/llvm/download.bzl

@@ -0,0 +1,11 @@
+"""LLVM Releases for macOS on Apple Silicon"""
+
+llvm_aarch64_darwin = {
+    "17.0.6": {
+        "urls": [
+            "https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/clang+llvm-17.0.6-arm64-apple-darwin22.0.tar.xz",
+        ],
+        "strip_prefix": "clang+llvm-17.0.6-arm64-apple-darwin22.0",
+        "sha256": "1264eb3c2a4a6d5e9354c3e5dc5cb6c6481e678f6456f36d2e0e566e9400fcad",
+    },
+}

cpp/private/llvm/releases_aarch64_darwin.bzl

@@ -0,0 +1,11 @@
+"""LLVM Releases for macOS on x86_64"""
+
+llvm_x64_darwin = {
+    "17.0.6": {
+        "urls": [
+            "https://github.com/alexbatashev/rules_cpp/releases/download/llvmorg-17.0.6-ccf0b487943416578ca0a7abb5cf70e0e24a7957/llvmorg-17.0.6-macos-x86_64.tar.zst",
+        ],
+        "strip_prefix": "llvmorg-17.0.6-macos-x86_64",
+        "sha256": "77d5d4654372425e82f20491ab8a7633cdbfed4911bf8af7404490187fbcdcdb",
+    },
+}

cpp/private/llvm/releases_x64_darwin.bzl

@@ -0,0 +1,11 @@
+"""LLVM Releases for Linux on x86_64"""
+
+llvm_x64_linux = {
+    "17.0.6": {
+        "urls": [
+            "https://github.com/alexbatashev/rules_cpp/releases/download/llvmorg-17.0.6-31a6a2ac5144effba2c8bd42950c994ba54230ae/llvmorg-17.0.6-linux-x86_64.tar.zst",
+        ],
+        "strip_prefix": "llvmorg-17.0.6-linux-x86_64",
+        "sha256": "a9f735bf262c2fd4805e3f66ee58ed5a7725978da7294d6654809a964f92ac82",
+    },
+}