authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-06-14 18:28:42-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-06-14 18:28:42-04:00
log84a700f97240eb2d4c65554d9be43bae9fa6d4ae
tree5aa82651f3bd402b2f3a55d4ba7d448e7a82f160
parent32dd98b19fe3cc384df32704dac0ff3e377dbe0c

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

2 files changed, 2 insertions(+), 1 deletions(-)

cmake/Findlld.cmake+1
......@@ -33,6 +33,7 @@ else()
3333 FIND_AND_ADD_LLD_LIB(lldELF)
3434 FIND_AND_ADD_LLD_LIB(lldCOFF)
3535 FIND_AND_ADD_LLD_LIB(lldMachO)
36 FIND_AND_ADD_LLD_LIB(lldWasm)
3637 FIND_AND_ADD_LLD_LIB(lldReaderWriter)
3738 FIND_AND_ADD_LLD_LIB(lldCore)
3839 FIND_AND_ADD_LLD_LIB(lldYAML)
src/zig_llvm.cpp+1-1
......@@ -850,7 +850,7 @@ bool ZigLLDLink(ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_
850850 return lld::elf::link(array_ref_args, false, diag);
851851
852852 case ZigLLVM_MachO:
853 return lld::mach_o::link(array_ref_args, diag);
853 return lld::mach_o::link(array_ref_args, false, diag);
854854
855855 case ZigLLVM_Wasm:
856856 return lld::wasm::link(array_ref_args, false, diag);