File tree 2 files changed +3
-1
lines changed
2 files changed +3
-1
lines changed Original file line number Diff line number Diff line change @@ -314,7 +314,7 @@ def _cc_toolchain_str(
314
314
# visible via the "built_in_include_directories" attribute of CcToolchainInfo as well as to keep
315
315
# them in sync with the directories included in the system module map generated for the stricter
316
316
# "layering_check" feature.
317
- toolchain_path_prefix = toolchain_info .llvm_dist_path_prefix
317
+ toolchain_path_prefix = "%workspace%/" + toolchain_info .llvm_dist_path_prefix
318
318
llvm_version = toolchain_info .llvm_version
319
319
major_llvm_version = int (llvm_version .split ("." )[0 ])
320
320
target_system_name = {
Original file line number Diff line number Diff line change @@ -37,6 +37,8 @@ def _system_module_map(ctx):
37
37
for include_dir in ctx .attr .cxx_builtin_include_directories :
38
38
if ctx .attr .sysroot_path and include_dir .startswith ("%sysroot%" ):
39
39
include_dir = ctx .attr .sysroot_path + include_dir [len ("%sysroot%" ):]
40
+ if include_dir .startswith ("%workspace%/" ):
41
+ include_dir = include_dir .removeprefix ("%workspace%/" )
40
42
include_dir = paths .normalize (include_dir ).replace ("//" , "/" )
41
43
if include_dir .startswith ("/" ):
42
44
absolute_path_dirs .append (include_dir )
You can’t perform that action at this time.
0 commit comments