aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/windows
diff options
context:
space:
mode:
authorGravatar Yun Peng <pcloudy@google.com>2016-09-07 15:02:12 +0000
committerGravatar Yun Peng <pcloudy@google.com>2016-09-08 08:43:53 +0000
commite1511ad20f9943de7d11478ff0a9dcd2a9998439 (patch)
treeee88bdae481b54af2ec7aaf260d04599f622a46e /src/main/java/com/google/devtools/build/lib/windows
parentd34445f9e84072116906c35c04c46e6ca6370cdc (diff)
Fixed a bug during bootstrap
Fixed #1732 RELNOTES: -- MOS_MIGRATED_REVID=132436686
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/windows')
-rw-r--r--src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocessFactory.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocessFactory.java
index fbd0cdd3dc..965a18672e 100644
--- a/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocessFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocessFactory.java
@@ -109,7 +109,10 @@ public class WindowsSubprocessFactory implements Subprocess.Factory {
StringBuilder result = new StringBuilder();
for (Map.Entry<String, String> entry : realEnv.entrySet()) {
if (entry.getKey().contains("=")) {
- throw new IOException("Environment variable names must not contain '='");
+ // lpEnvironment requires no '=' in environment variable name, but on Windows,
+ // System.getenv() returns environment variables like '=C:' or '=ExitCode', so it can't
+ // be an error, we have ignore them here.
+ continue;
}
result.append(entry.getKey() + "=" + entry.getValue() + "\0");
}