diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2016-01-18 11:03:59 +0000 |
|---|---|---|
| committer |  Han-Wen Nienhuys <hanwen@google.com> | 2016-01-18 14:34:55 +0000 |
| commit | e5b7c591f44487b55a850870f5db660212402b60 (patch) | |
| tree | 761200b1b83815f4095d5df06f9a0c4f9b60e11f /src/main/java/com/google/devtools/build/lib/runtime | |
| parent | 198a54f95e88d7547e0458aba8ab63833005b81b (diff) | |
Do not use sandboxing when bootstrapping
This simplify the bootstrap process and remove a C++ tool from
the bootstrap binary.
--
MOS_MIGRATED_REVID=112394555
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/runtime')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java index 54353d5f89..34f6819afd 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java @@ -246,8 +246,11 @@ public class RunCommand implements BlazeCommand { options.getOptions(BuildRequestOptions.class).getSymlinkPrefix()); List<String> cmdLine = new ArrayList<>(); if (runOptions.scriptPath == null) { + PathFragment processWrapperPath = runtime.getBinTools().getExecPath(PROCESS_WRAPPER); + Preconditions.checkNotNull( + processWrapperPath, PROCESS_WRAPPER + " not found in embedded tools"); cmdLine.add(runtime.getDirectories().getExecRoot() - .getRelative(runtime.getBinTools().getExecPath(PROCESS_WRAPPER)).getPathString()); + .getRelative(processWrapperPath).getPathString()); cmdLine.add("-1"); cmdLine.add("15"); cmdLine.add("-"); |