diff --git a/BRANCH_TODO b/BRANCH_TODO
index c3f80a204d..9f6bf9ffef 100644
--- a/BRANCH_TODO
+++ b/BRANCH_TODO
@@ -46,3 +46,6 @@
  * there are a couple panic("TODO") in clang options parsing
  * std.testing needs improvement to support exposing directory path for its tmp dir (look for "bogus")
  * integrate target features into building assembly code
+ * libc_installation.zig: make it look for msvc only if msvc abi is chosen
+ * switch the default C ABI for windows to be mingw-w64
+ * port windows_sdk.cpp to zig
diff --git a/src-self-hosted/libc_installation.zig b/src-self-hosted/libc_installation.zig
index eb59ef7e6a..8e380af936 100644
--- a/src-self-hosted/libc_installation.zig
+++ b/src-self-hosted/libc_installation.zig
@@ -169,6 +169,8 @@ pub const LibCInstallation = struct {
         var self: LibCInstallation = .{};
 
         if (is_windows) {
+            if (!build_options.have_llvm)
+                return error.WindowsSdkNotFound;
             var sdk: *ZigWindowsSDK = undefined;
             switch (zig_find_windows_sdk(&sdk)) {
                 .None => {