zig

commit 84a700f97240eb2d4c65554d9be43bae9fa6d4ae (tree)
parent 32dd98b19fe3cc384df32704dac0ff3e377dbe0c
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Thu, 14 Jun 2018 18:28:42 -0400

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

Diffstat:
M
cmake/Findlld.cmake
 | 
1
+
M
src/zig_llvm.cpp
 | 
2
+-

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git 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
@@ -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);