diff options
author | 2018-02-20 08:48:39 -0800 | |
---|---|---|
committer | 2018-02-20 08:50:17 -0800 | |
commit | f03b8f84310319f1db984b53e8a3e8d9a8ae021b (patch) | |
tree | cc98f0c7cc49fa77addf1a10173b6103c3fc4599 /src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java | |
parent | 2dca40b3b4d90899ff0ad8c7451cea835c83f783 (diff) |
Fix env for local fallback (from remote exec) on Windows and Linux
PiperOrigin-RevId: 186309181
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java index d6124d8616..a3bcb4c14f 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java +++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java @@ -25,6 +25,8 @@ import com.google.devtools.build.lib.exec.apple.XCodeLocalEnvProvider; import com.google.devtools.build.lib.exec.local.LocalEnvProvider; import com.google.devtools.build.lib.exec.local.LocalExecutionOptions; import com.google.devtools.build.lib.exec.local.LocalSpawnRunner; +import com.google.devtools.build.lib.exec.local.PosixLocalEnvProvider; +import com.google.devtools.build.lib.exec.local.WindowsLocalEnvProvider; import com.google.devtools.build.lib.runtime.CommandEnvironment; import com.google.devtools.build.lib.util.OS; import javax.annotation.Nullable; @@ -92,7 +94,9 @@ final class RemoteActionContextProvider extends ActionContextProvider { LocalEnvProvider localEnvProvider = OS.getCurrent() == OS.DARWIN ? new XCodeLocalEnvProvider(env.getClientEnv()) - : LocalEnvProvider.UNMODIFIED; + : (OS.getCurrent() == OS.WINDOWS + ? new WindowsLocalEnvProvider(env.getClientEnv()) + : new PosixLocalEnvProvider(env.getClientEnv())); return new LocalSpawnRunner( env.getExecRoot(), |