Skip to content

Commit

Permalink
[Bazel] Use dynamic workspace root determination
Browse files Browse the repository at this point in the history
The `clang:ast` and `clang:builtin_headers_gen` targets currently use hardcoded `external/llvm-project`
paths to access generated headers.

With bzlmod this path becomes dependent on the module name, module version and module extension,
so we need a more dynamic approach.

Does not affect the WORKSPACE build.

Reviewed By: GMNGeoffrey, #bazel_build

Differential Revision: https://reviews.llvm.org/D137007
  • Loading branch information
aaronmondal committed Apr 17, 2023
1 parent 3a6c66a commit 459420c
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 3 deletions.
15 changes: 12 additions & 3 deletions utils/bazel/llvm-project-overlay/clang/BUILD.bazel
Expand Up @@ -3,6 +3,7 @@
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
load("//:workspace_root.bzl", "workspace_root")
load("//llvm:tblgen.bzl", "gentbl")
load("//llvm:binary_alias.bzl", "binary_alias")
load("//llvm:cc_plugin_library.bzl", "cc_plugin_library")
Expand Down Expand Up @@ -718,6 +719,8 @@ gentbl(
],
)

workspace_root(name = "workspace_root")

cc_library(
name = "ast",
srcs = glob([
Expand All @@ -742,8 +745,8 @@ cc_library(
# least bad approach. Using `includes` is *specifically* problematic for
# this library because it contains files that collide easily with system
# headers such as `CXXABI.h`.
"-I$(GENDIR)/external/llvm-project/clang/lib/AST",
"-I$(GENDIR)/external/llvm-project/clang/lib/AST/Interp",
"-I$(GENDIR)/$(WORKSPACE_ROOT)/clang/lib/AST",
"-I$(GENDIR)/$(WORKSPACE_ROOT)/clang/lib/AST/Interp",
],
textual_hdrs = [
"include/clang/AST/AttrImpl.inc",
Expand All @@ -763,6 +766,9 @@ cc_library(
] + glob([
"include/clang/AST/*.def",
]),
toolchains = [
":workspace_root",
],
deps = [
":ast_attr_gen",
":ast_comment_command_info_gen",
Expand Down Expand Up @@ -1536,12 +1542,15 @@ genrule(
outs = [hdr.replace("lib/Headers/", "staging/include/") for hdr in builtin_headers],
cmd = """
for src in $(SRCS); do
relsrc=$${src/*external\\/llvm-project\\/clang\\/lib\\/Headers\\/}
relsrc=$${src/*"$(WORKSPACE_ROOT)"\\/clang\\/lib\\/Headers}
target=$(@D)/staging/include/$$relsrc
mkdir -p $$(dirname $$target)
cp $$src $$target
done""",
output_to_bindir = 1,
toolchains = [
":workspace_root",
],
)

cc_library(
Expand Down
17 changes: 17 additions & 0 deletions utils/bazel/llvm-project-overlay/workspace_root.bzl
@@ -0,0 +1,17 @@
def _workspace_root_impl(ctx):
"""Dynamically determine the workspace root from the current context.
The path is made available as a `WORKSPACE_ROOT` environmment variable and
may for instance be consumed in the `toolchains` attributes for `cc_library`
and `genrule` targets.
"""
return [
platform_common.TemplateVariableInfo({
"WORKSPACE_ROOT": ctx.label.workspace_root,
}),
]

workspace_root = rule(
implementation = _workspace_root_impl,
attrs = {},
)

0 comments on commit 459420c

Please sign in to comment.