Compilation: take into account if LLVM is available in lib-building logic

1 files changed, 7 insertions, 11 deletions

diff --git a/src/Compilation.zig b/src/Compilation.zig
index 7c8dd84457..b9ba8359ee 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -6243,11 +6243,9 @@ fn canBuildLibCompilerRt(target: std.Target, use_llvm: bool) bool {
         else => {},
     }
     return switch (zigBackend(target, use_llvm)) {
-        .stage2_llvm,
-        .stage2_x86_64,
-        => true,
-
-        else => false,
+        .stage2_llvm => true,
+        .stage2_x86_64 => if (target.ofmt == .elf) true else build_options.have_llvm,
+        else => build_options.have_llvm,
     };
 }
 
@@ -6262,7 +6260,7 @@ fn canBuildLibSsp(target: std.Target, use_llvm: bool) bool {
     }
     return switch (zigBackend(target, use_llvm)) {
         .stage2_llvm => true,
-        else => false,
+        else => build_options.have_llvm,
     };
 }
 
@@ -6278,11 +6276,9 @@ fn canBuildZigLibC(target: std.Target, use_llvm: bool) bool {
         else => {},
     }
     return switch (zigBackend(target, use_llvm)) {
-        .stage2_llvm,
-        .stage2_x86_64,
-        => true,
-
-        else => false,
+        .stage2_llvm => true,
+        .stage2_x86_64 => if (target.ofmt == .elf) true else build_options.have_llvm,
+        else => build_options.have_llvm,
     };
 }