mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-29 09:33:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jakub Konka 2023-11-04 16:09:52 +01:00
parent 533c88158e
commit 7a186d9eb6
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Compilation.zig
View File

@ -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,
};
}