From e1511ad20f9943de7d11478ff0a9dcd2a9998439 Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Wed, 7 Sep 2016 15:02:12 +0000 Subject: Fixed a bug during bootstrap Fixed #1732 RELNOTES: -- MOS_MIGRATED_REVID=132436686 --- .../google/devtools/build/lib/windows/WindowsSubprocessFactory.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/windows') 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 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"); } -- cgit v1.2.3