Add a --deep_execroot startup option that puts the execroot under $OUTPUT_BASE/execroot/<workspace name> instead of $OUTPUT_BASE/<workspace name>.

This makes it possible to run Bazel in directories whose name clashes with one of the pre-existing files in the output base. Note that this option is turned off by default for now.

--
MOS_MIGRATED_REVID=109791053

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index d804e11d67..2ddf066088 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -1113,7 +1113,7 @@ public final class BlazeRuntime {
     }
 
     PathFragment outputPathFragment = BlazeDirectories.outputPathFromOutputBase(
-        outputBase, workspaceDirectory);
+        outputBase, workspaceDirectory, startupOptions.deepExecRoot);
     FileSystem fs = null;
     for (BlazeModule module : blazeModules) {
       FileSystem moduleFs = module.getFileSystem(options, outputPathFragment);
@@ -1137,7 +1137,7 @@ public final class BlazeRuntime {
 
     BlazeDirectories directories =
         new BlazeDirectories(installBasePath, outputBasePath, workspaceDirectoryPath,
-                             startupOptions.installMD5);
+                             startupOptions.deepExecRoot, startupOptions.installMD5);
 
     Clock clock = BlazeClock.instance();