Skip to content

Commit e5748d9

Browse files
authored
Emit canonical labels if needed in pkg_name_from_label
Previously resulted in errors such as: ``` Traceback (most recent call last): File "/private/var/tmp/_bazel_fmeum/5d22c23119063f77cfcdafc5f5d52f01/external/toolchains_llvm+/toolchain/internal/configure.bzl", line 141, column 66, in llvm_config_impl sysroot_paths_dict, sysroot_labels_dict = _sysroot_paths_dict( File "/private/var/tmp/_bazel_fmeum/5d22c23119063f77cfcdafc5f5d52f01/external/toolchains_llvm+/toolchain/internal/sysroot.bzl", line 76, column 53, in sysroot_paths_dict path = _canonical_dir_path(str(rctx.path(label).dirname)) Error in path: Unable to load package for @@[unknown repo 'toy-toolchain++toy_sysroot+sysroot_amd64_ubuntu' requested from @@toolchains_llvm+]//:BUILD.bazel: The repository '@@[unknown repo 'toy-toolchain++toy_sysroot+sysroot_amd64_ubuntu' requested from @@toolchains_llvm+]' could not be resolved: No repository visible as '@toy-toolchain++toy_sysroot+sysroot_amd64_ubuntu' from repository '@@toolchains_llvm+ ```
1 parent b3c96d2 commit e5748d9

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

toolchain/internal/common.bzl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,8 @@ def is_absolute_path(val):
201201
return val and val[0] == "/" and (len(val) == 1 or val[1] != "/")
202202

203203
def pkg_name_from_label(label):
204-
if label.workspace_name:
205-
return "@" + label.workspace_name + "//" + label.package
206-
else:
207-
return label.package
204+
s = str(label)
205+
return s[:s.rindex(":")]
208206

209207
def pkg_path_from_label(label):
210208
if label.workspace_root:

0 commit comments

Comments
 (0)