diff options
author | Googler <noreply@google.com> | 2015-07-23 13:07:30 +0000 |
---|---|---|
committer | Laszlo Csomor <laszlocsomor@google.com> | 2015-07-23 14:04:14 +0000 |
commit | 88b63880f7a1b8be98affe352da428bc2787d9f1 (patch) | |
tree | b83ebc67d814235053f368e80cd9601561c0633c /src/main/java | |
parent | 196d3b4fbbc343851e5c86dba2b1fdd4ec47eb40 (diff) |
Fix OS detection for Windows.
--
MOS_MIGRATED_REVID=98927867
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/util/OS.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/util/OS.java b/src/main/java/com/google/devtools/build/lib/util/OS.java index ee2e6d4cd4..04e437b8f2 100644 --- a/src/main/java/com/google/devtools/build/lib/util/OS.java +++ b/src/main/java/com/google/devtools/build/lib/util/OS.java @@ -49,8 +49,13 @@ public enum OS { osName = System.getProperty("os.name"); } + if (osName == null) { + return OS.UNKNOWN; + } + for (OS os : OS.values()) { - if (os.detectionName.equals(osName)) { + // Windows have many names, all starting with "Windows". + if (osName.startsWith(os.detectionName)) { return os; } } |