1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleConfiguredTargetBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleConfiguredTargetBuilder.java
index 11eca3b9dc..683771e8b1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleConfiguredTargetBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleConfiguredTargetBuilder.java
@@ -176,7 +176,7 @@ public final class SkylarkRuleConfiguredTargetBuilder {
     }
 
     RunfilesProvider runfilesProvider = statelessRunfiles != null
-        ? RunfilesProvider.simple(merge(statelessRunfiles, executable))
+        ? RunfilesProvider.simple(merge(statelessRunfiles, executable, ruleContext))
         : RunfilesProvider.withData(
             // The executable doesn't get into the default runfiles if we have runfiles states.
             // This is to keep skylark genrule consistent with the original genrule.
@@ -220,10 +220,11 @@ public final class SkylarkRuleConfiguredTargetBuilder {
         paramName, EvalUtils.getDataTypeName(value, false), value);
   }
 
-  private static Runfiles merge(Runfiles runfiles, Artifact executable) {
+  private static Runfiles merge(Runfiles runfiles, Artifact executable, RuleContext ruleContext) {
     if (executable == null) {
       return runfiles;
     }
-    return new Runfiles.Builder().addArtifact(executable).merge(runfiles).build();
+    return new Runfiles.Builder(ruleContext.getWorkspaceName()).addArtifact(executable)
+        .merge(runfiles).build();
   }
 }