From 474def653e58d42aee64ba3741ae275a36fe14ae Mon Sep 17 00:00:00 2001 From: Romain Chossart Date: Thu, 25 Apr 2024 12:42:40 +0100 Subject: [PATCH] Append workspace name in runfiles in pkg_files Commit a811e7f44f09a2348735527fd999f04df8a7dbc7 recently fixed an issue where the workspace name was missing from the path for runfiles added via `pkg_tar` and some other rules. This extends the fix to `pkg_files` as well. --- pkg/mappings.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/mappings.bzl b/pkg/mappings.bzl index 704a8db2..d5a96a0b 100644 --- a/pkg/mappings.bzl +++ b/pkg/mappings.bzl @@ -298,7 +298,7 @@ def _pkg_files_impl(ctx): target = file_to_target[src] runfiles = target[DefaultInfo].default_runfiles if runfiles: - base_path = src_dest_paths_map[src] + ".runfiles" + base_path = src_dest_paths_map[src] + ".runfiles/" + ctx.workspace_name for rf in runfiles.files.to_list(): dest_path = paths.join(base_path, rf.short_path)