From 84a700f97240eb2d4c65554d9be43bae9fa6d4ae Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 14 Jun 2018 18:28:42 -0400 Subject: [PATCH] llvm7: find external liblldWasm and update for newest lld macho API --- cmake/Findlld.cmake | 1 + src/zig_llvm.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/Findlld.cmake b/cmake/Findlld.cmake index d3c9011205..1c4e9163a3 100644 --- a/cmake/Findlld.cmake +++ b/cmake/Findlld.cmake @@ -33,6 +33,7 @@ else() FIND_AND_ADD_LLD_LIB(lldELF) FIND_AND_ADD_LLD_LIB(lldCOFF) FIND_AND_ADD_LLD_LIB(lldMachO) + FIND_AND_ADD_LLD_LIB(lldWasm) FIND_AND_ADD_LLD_LIB(lldReaderWriter) FIND_AND_ADD_LLD_LIB(lldCore) FIND_AND_ADD_LLD_LIB(lldYAML) diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp index b990ae2310..95d7d65d99 100644 --- a/src/zig_llvm.cpp +++ b/src/zig_llvm.cpp @@ -850,7 +850,7 @@ bool ZigLLDLink(ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_ return lld::elf::link(array_ref_args, false, diag); 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: return lld::wasm::link(array_ref_args, false, diag);