diff --git a/src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java b/src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java
index df2e8cdc6aa1fb..4aebe824cdb7a8 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java
@@ -262,9 +262,15 @@ private void listDirectoryContents(
         if (dirent.getType() == Dirent.Type.DIRECTORY) {
           listDirectoryContents(child, addFile, metadataProvider);
         } else {
+          String pathString;
+          if (child.startsWith(execRoot)) {
+            pathString = child.relativeTo(execRoot).toString();
+          } else {
+            pathString = child.toString();
+          }
           addFile.accept(
               File.newBuilder()
-                  .setPath(child.relativeTo(execRoot).toString())
+                  .setPath(pathString)
                   .setDigest(computeDigest(null, child, metadataProvider, xattrProvider))
                   .build());
         }