Skip to content

Commit c85ebaa

Browse files
committed
Again fix priv file handling
We need to use short_path so that generated priv files are not misplaced
1 parent a84ffac commit c85ebaa

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

ct.bzl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,17 @@ def code_paths(dep):
3838

3939
def additional_file_dest_relative_path(dep_label, f):
4040
if dep_label.workspace_root != "":
41+
workspace_root = dep_label.workspace_root.replace("external/", "../")
4142
if dep_label.package != "":
42-
rel_base = path_join(dep_label.workspace_root, dep_label.package)
43+
rel_base = path_join(workspace_root, dep_label.package)
4344
else:
44-
rel_base = dep_label.workspace_root
45+
rel_base = workspace_root
4546
else:
4647
rel_base = dep_label.package
4748
if rel_base != "":
48-
return f.path.replace(rel_base + "/", "")
49+
return f.short_path.replace(rel_base + "/", "")
4950
else:
50-
return f.path
51+
return f.short_path
5152

5253
def _impl(ctx):
5354
erlang_version = ctx.attr._erlang_version[ErlangVersionProvider].version

0 commit comments

Comments
 (0)