From 88b63880f7a1b8be98affe352da428bc2787d9f1 Mon Sep 17 00:00:00 2001
From: Googler <noreply@google.com>
Date: Thu, 23 Jul 2015 13:07:30 +0000
Subject: Fix OS detection for Windows.

--
MOS_MIGRATED_REVID=98927867
---
 src/main/java/com/google/devtools/build/lib/util/OS.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/main/java')

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;
       }
     }
-- 
cgit v1.2.3