mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-15 05:48:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

zld: invoke traditional linker if has LLVM as a temp measure

Browse Source
This commit is contained in:
Jakub Konka 2021-07-14 13:14:41 +02:00
parent 9ca69c51e7
commit f87424ab63
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Compilation.zig
View File

@ -907,9 +907,10 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {
break :blk false;
};
const darwin_can_use_system_sdk = comptime std.Target.current.isDarwin() and
std.builtin.os.tag == .macos and
options.target.isDarwin();
const darwin_can_use_system_sdk = blk: {
if (comptime !std.Target.current.isDarwin()) break :blk false;
break :blk std.builtin.os.tag == .macos and options.target.isDarwin();
};
const sysroot = blk: {
if (options.sysroot) |sysroot| {

2
src/link/MachO.zig
View File

@ -434,7 +434,7 @@ pub fn flush(self: *MachO, comp: *Compilation) !void {
}
}
if (build_options.have_llvm and self.base.options.use_lld) {
if (build_options.have_llvm) {
return self.linkWithZld(comp);
} else {
switch (self.base.options.effectiveOutputMode()) {