summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rupert Shuttleworth <ruperts@google.com> 2021-04-03 03:07:36 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-04-03 03:07:36 +0000
commit176cf46f400e762dbc35bb9c5ba85bae881c1851 (patch)
treeecc65c21583a5ee6c04fecfe05dbe0065847f8dd
parent100d5d67328e91d88f11ba8ec7a5a3997d9c5bdc (diff)
parentbf94d2fdbad61650f6d657881b01ab2a4288a5ca (diff)
Merge "Allow Bazel actions to see the SHELL variable."
-rw-r--r--ui/build/bazel.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/build/bazel.go b/ui/build/bazel.go
index ec561d540..0ebfcd804 100644
--- a/ui/build/bazel.go
+++ b/ui/build/bazel.go
@@ -149,6 +149,9 @@ func runBazel(ctx Context, config Config) {
cmd.Args = append(cmd.Args, "--action_env=PATH="+pathEnvValue)
}
+ // Allow Bazel actions to see the SHELL variable (passed to Bazel above)
+ cmd.Args = append(cmd.Args, "--action_env=SHELL")
+
// Append custom build flags to the Bazel command. Changes to these flags
// may invalidate Bazel's analysis cache.
// These should be appended as the final args, so that they take precedence.