diff options
| author |  Luis Fernando Pino Duque <lpino@google.com> | 2017-02-08 14:09:16 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2017-02-08 15:52:23 +0000 |
| commit | 49d97f9bb4dd04ef62198ded7b53b2a8f8c603db (patch) | |
| tree | 53c7a99c9ea16ed38b2df9089ed0c7d2ee3b0003 /src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java | |
| parent | 918814e9fc0c2055d275b22fea0a8d9bd2e011d8 (diff) | |
Apply --symlink_prefix to the output and exec root symlinks.
Turns out --symlink_prefix is not applied to the bazel-{out,workspace}
unlike bazel-{bin,genfiles,testlogs} thus breaking the semantics of
--symlink_prefix.
This CL fixes the problem by using the symlink prefix instead of the
product name when building the output and exec root symlinks.
RELNOTES[INC]: Using --symlink_prefix is now applied to the output
symlink (e.g. bazel-out) and the exec root symlink (e.g. bazel-workspace).
--
PiperOrigin-RevId: 146902534
MOS_MIGRATED_REVID=146902534
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java | 3 |
1 files changed, 1 insertions, 2 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 4e3c9dc0db..12f03a0086 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,7 @@ public class RunCommand implements BlazeCommand { PathFragment prettyExecutablePath = OutputDirectoryLinksUtils.getPrettyPath(executablePath, env.getWorkspaceName(), env.getWorkspace(), - options.getOptions(BuildRequestOptions.class).getSymlinkPrefix(productName), - productName); + options.getOptions(BuildRequestOptions.class).getSymlinkPrefix(productName)); List<String> cmdLine = new ArrayList<>(); if (runOptions.scriptPath == null) { PathFragment processWrapperPath = |