Fix runfiles lookup under bzlmod in Bazel 6

bazelbuild · Jan 5, 2023 · b5688b3 · b5688b3
1 parent 1859122
commit b5688b3
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/tools/worker/worker_main.cc b/tools/worker/worker_main.cc
@@ -25,7 +25,11 @@ using bazel::tools::cpp::runfiles::Runfiles;
 
 int main(int argc, char *argv[]) {
   std::string index_import_path;
-  std::unique_ptr<Runfiles> runfiles(Runfiles::Create(argv[0]));
+  #ifdef BAZEL_CURRENT_REPOSITORY
+    std::unique_ptr<Runfiles> runfiles(Runfiles::Create(argv[0], BAZEL_CURRENT_REPOSITORY));
+  #else
+    std::unique_ptr<Runfiles> runfiles(Runfiles::Create(argv[0]));
+  #endif  // BAZEL_CURRENT_REPOSITORY
   if (runfiles != nullptr) {
     // We silently ignore errors here, we will report an error later if this
     // path is accessed