Skip to content

cc_toolchain: prefix include directories with %workspace% #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 11, 2025
Merged

cc_toolchain: prefix include directories with %workspace% #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion toolchain/internal/configure.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ def _cc_toolchain_str(
# visible via the "built_in_include_directories" attribute of CcToolchainInfo as well as to keep
# them in sync with the directories included in the system module map generated for the stricter
# "layering_check" feature.
toolchain_path_prefix = toolchain_info.llvm_dist_path_prefix
toolchain_path_prefix = "%workspace%/" + toolchain_info.llvm_dist_path_prefix
llvm_version = toolchain_info.llvm_version
major_llvm_version = int(llvm_version.split(".")[0])
target_system_name = {
Expand Down
2 changes: 2 additions & 0 deletions toolchain/internal/system_module_map.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ def _system_module_map(ctx):
for include_dir in ctx.attr.cxx_builtin_include_directories:
if ctx.attr.sysroot_path and include_dir.startswith("%sysroot%"):
include_dir = ctx.attr.sysroot_path + include_dir[len("%sysroot%"):]
if include_dir.startswith("%workspace%/"):
include_dir = include_dir.removeprefix("%workspace%/")
include_dir = paths.normalize(include_dir).replace("//", "/")
if include_dir.startswith("/"):
absolute_path_dirs.append(include_dir)
Expand Down
Loading