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

llvm7: find external liblldWasm and update for newest lld macho API

Browse Source
This commit is contained in:
Andrew Kelley 2018-06-14 18:28:42 -04:00
parent 32dd98b19f
commit 84a700f972
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/Findlld.cmake
View File

@ -33,6 +33,7 @@ else()
FIND_AND_ADD_LLD_LIB(lldELF) FIND_AND_ADD_LLD_LIB(lldELF)
FIND_AND_ADD_LLD_LIB(lldCOFF) FIND_AND_ADD_LLD_LIB(lldCOFF)
FIND_AND_ADD_LLD_LIB(lldMachO) FIND_AND_ADD_LLD_LIB(lldMachO)
FIND_AND_ADD_LLD_LIB(lldWasm)
FIND_AND_ADD_LLD_LIB(lldReaderWriter) FIND_AND_ADD_LLD_LIB(lldReaderWriter)
FIND_AND_ADD_LLD_LIB(lldCore) FIND_AND_ADD_LLD_LIB(lldCore)
FIND_AND_ADD_LLD_LIB(lldYAML) FIND_AND_ADD_LLD_LIB(lldYAML)

2
src/zig_llvm.cpp
View File

@ -850,7 +850,7 @@ bool ZigLLDLink(ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_
return lld::elf::link(array_ref_args, false, diag); return lld::elf::link(array_ref_args, false, diag);
case ZigLLVM_MachO: case ZigLLVM_MachO:
return lld::mach_o::link(array_ref_args, diag); return lld::mach_o::link(array_ref_args, false, diag);
case ZigLLVM_Wasm: case ZigLLVM_Wasm:
return lld::wasm::link(array_ref_args, false, diag); return lld::wasm::link(array_ref_args, false, diag);