Commit 7a186d9eb6a84fb22bdb53b9c81a70169e9fa65f | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2023-11-04 16:09:52+01:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2023-11-04 16:09:52+01:00
log	7a186d9eb6a84fb22bdb53b9c81a70169e9fa65f
tree	12f3fb9acb1f90b19a8705bcc0cb89c95ed3e28b
parent	533c88158ee2d0653e0d1f618371d56d81786214

1 files changed, 7 insertions(+), 11 deletions(-)

src/Compilation.zig+7-11

 @@ -6243,11 +6243,9 @@ fn canBuildLibCompilerRt(target: std.Target, use_llvm: bool) bool {
         else => {},
     }
     return switch (zigBackend(target, use_llvm)) {
-        .stage2_llvm,
+        .stage2_llvm => true,
-        .stage2_x86_64,
+        .stage2_x86_64 => if (target.ofmt == .elf) true else build_options.have_llvm,
-        => true,
+        else => build_options.have_llvm,
-        else => false,
     };
 }
 @@ -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_llvm => true,
-        .stage2_x86_64,
+        .stage2_x86_64 => if (target.ofmt == .elf) true else build_options.have_llvm,
-        => true,
+        else => build_options.have_llvm,
-        else => false,
     };
 }