authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-11-04 16:09:52+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-11-04 16:09:52+01:00
log7a186d9eb6a84fb22bdb53b9c81a70169e9fa65f
tree12f3fb9acb1f90b19a8705bcc0cb89c95ed3e28b
parent533c88158ee2d0653e0d1f618371d56d81786214

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

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 {
62436243 else => {},
62446244 }
62456245 return switch (zigBackend(target, use_llvm)) {
6246 .stage2_llvm,
6247 .stage2_x86_64,
6248 => true,
6249
6250 else => false,
6246 .stage2_llvm => true,
6247 .stage2_x86_64 => if (target.ofmt == .elf) true else build_options.have_llvm,
6248 else => build_options.have_llvm,
62516249 };
62526250}
62536251
......@@ -6262,7 +6260,7 @@ fn canBuildLibSsp(target: std.Target, use_llvm: bool) bool {
62626260 }
62636261 return switch (zigBackend(target, use_llvm)) {
62646262 .stage2_llvm => true,
6265 else => false,
6263 else => build_options.have_llvm,
62666264 };
62676265}
62686266
......@@ -6278,11 +6276,9 @@ fn canBuildZigLibC(target: std.Target, use_llvm: bool) bool {
62786276 else => {},
62796277 }
62806278 return switch (zigBackend(target, use_llvm)) {
6281 .stage2_llvm,
6282 .stage2_x86_64,
6283 => true,
6284
6285 else => false,
6279 .stage2_llvm => true,
6280 .stage2_x86_64 => if (target.ofmt == .elf) true else build_options.have_llvm,
6281 else => build_options.have_llvm,
62866282 };
62876283}
62886284