From 0cd63b28f32fdf5aaedf9daa8ff60ec58de2f7f4 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Wed, 3 Jan 2018 22:38:13 -0500
Subject: fix self-hosted build on windows

---
 build.zig | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'build.zig')

diff --git a/build.zig b/build.zig
index 2ff98819f1..d78a9de37b 100644
--- a/build.zig
+++ b/build.zig
@@ -209,8 +209,19 @@ pub fn installCHeaders(b: &Builder, c_header_files: []const u8) {
 
 fn nextValue(index: &usize, build_info: []const u8) -> []const u8 {
     const start = *index;
-    while (build_info[*index] != '\n' and build_info[*index] != '\r') : (*index += 1) { }
-    const result = build_info[start..*index];
-    *index += 1;
-    return result;
+    while (true) : (*index += 1) {
+        switch (build_info[*index]) {
+            '\n' => {
+                const result = build_info[start..*index];
+                *index += 1;
+                return result;
+            },
+            '\r' => {
+                const result = build_info[start..*index];
+                *index += 2;
+                return result;
+            },
+            else => continue,
+        }
+    }
 }
-- 
cgit v1.2.3