From 75328e32045d1275c03f1f37058ee0a3b775c632 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Sun, 22 Apr 2018 21:47:25 -0400
Subject: [PATCH] exit(1) instead of abort() for file not found

---
 src/analyze.cpp | 6 ++++--
 src/codegen.cpp | 6 ++++--
 src/os.cpp      | 3 ---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/analyze.cpp b/src/analyze.cpp
index 5dd7b0d18c..a598d7676e 100644
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@@ -4306,7 +4306,8 @@ bool handle_is_ptr(TypeTableEntry *type_entry) {
 static ZigWindowsSDK *get_windows_sdk(CodeGen *g) {
     if (g->win_sdk == nullptr) {
         if (os_find_windows_sdk(&g->win_sdk)) {
-            zig_panic("Unable to determine Windows SDK path.");
+            fprintf(stderr, "unable to determine windows sdk path\n");
+            exit(1);
         }
     }
     assert(g->win_sdk != nullptr);
@@ -4408,7 +4409,8 @@ void find_libc_include_path(CodeGen *g) {
             ZigWindowsSDK *sdk = get_windows_sdk(g);
             g->libc_include_dir = buf_alloc();
             if (os_get_win32_ucrt_include_path(sdk, g->libc_include_dir)) {
-                zig_panic("Unable to determine libc include path.");
+                fprintf(stderr, "Unable to determine libc include path. --libc-include-dir");
+                exit(1);
             }
         } else if (g->zig_target.os == OsLinux) {
             g->libc_include_dir = get_linux_libc_include_path();
diff --git a/src/codegen.cpp b/src/codegen.cpp
index 4581c3e2b3..2d8c385f44 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -6638,12 +6638,14 @@ static void gen_root_source(CodeGen *g) {
     Buf *abs_full_path = buf_alloc();
     int err;
     if ((err = os_path_real(rel_full_path, abs_full_path))) {
-        zig_panic("unable to open '%s': %s", buf_ptr(rel_full_path), err_str(err));
+        fprintf(stderr, "unable to open '%s': %s", buf_ptr(rel_full_path), err_str(err));
+        exit(1);
     }
 
     Buf *source_code = buf_alloc();
     if ((err = os_fetch_file_path(rel_full_path, source_code, true))) {
-        zig_panic("unable to open '%s': %s", buf_ptr(rel_full_path), err_str(err));
+        fprintf(stderr, "unable to open '%s': %s", buf_ptr(rel_full_path), err_str(err));
+        exit(1);
     }
 
     g->root_import = add_source_file(g, g->root_package, abs_full_path, source_code);
diff --git a/src/os.cpp b/src/os.cpp
index c93e2887b7..97462bd658 100644
--- a/src/os.cpp
+++ b/src/os.cpp
@@ -1334,9 +1334,6 @@ com_done:;
 
 int os_get_win32_ucrt_lib_path(ZigWindowsSDK *sdk, Buf* output_buf, ZigLLVM_ArchType platform_type) {
 #if defined(ZIG_OS_WINDOWS)
-    if (buf_len(&sdk->path10) == 0 || buf_len(&sdk->version10) == 0) {
-        return ErrorFileNotFound;
-    }
     buf_resize(output_buf, 0);
     buf_appendf(output_buf, "%s\\Lib\\%s\\ucrt\\", buf_ptr(&sdk->path10), buf_ptr(&sdk->version10));
     switch (platform_type) {