diff options
| author | Tobias Bosch <tbosch@google.com> | 2019-09-13 12:04:02 -0700 |
|---|---|---|
| committer | Tobias Bosch <tbosch@google.com> | 2019-09-13 20:00:20 +0000 |
| commit | 6123df2f415ee532bd31a2bd7b86dff033b87617 (patch) | |
| tree | 0d75230f42924c347c6f9bdb4f6eb3b7d49476d9 /compiler_wrapper/env.go | |
| parent | 3b8531f0c0739003a208b7beb002d1058656a962 (diff) | |
| download | toolchain-utils-6123df2f415ee532bd31a2bd7b86dff033b87617.tar.gz | |
Use execve with properly merged env variables.
This reverts 478cfee03066d58ca3899753de95a58f35a96835
(Modify hostenv and use execv instead of execve).
The original problem was actually that execve
doesn't merge updates into the environment variables,
in contrast to exec.Command.
Now that we have our own merging logic (to e.g. support
removal of variables), we can just use that.
BUG=chromium:773875
TEST=emerge-kevin sci-libs/tensorflow
Change-Id: I4a8412a73f4e79ad7b6d502602f442b2524efb06
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1804354
Reviewed-by: George Burgess <gbiv@chromium.org>
Tested-by: Tobias Bosch <tbosch@google.com>
Diffstat (limited to 'compiler_wrapper/env.go')
| -rw-r--r-- | compiler_wrapper/env.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler_wrapper/env.go b/compiler_wrapper/env.go index c8f31357..4d83b17a 100644 --- a/compiler_wrapper/env.go +++ b/compiler_wrapper/env.go @@ -71,7 +71,7 @@ func (env *processEnv) stderr() io.Writer { } func (env *processEnv) exec(cmd *command) error { - return libcExec(cmd) + return libcExec(env, cmd) } func (env *processEnv) run(cmd *command, stdin io.Reader, stdout io.Writer, stderr io.Writer) error { |