Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to LLVM 5.0.1rc2

Browse Source
This commit is contained in:
Andrew Kelley 2017-12-01 13:44:28 -05:00
parent bdd5241615
commit cf96b6f87b
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -47,15 +47,20 @@ option(ZIG_TEST_COVERAGE "Build Zig with test coverage instrumentation" OFF)
option(ZIG_FORCE_EXTERNAL_LLD "If your system has the LLD patches use it instead of the embedded LLD" OFF) option(ZIG_FORCE_EXTERNAL_LLD "If your system has the LLD patches use it instead of the embedded LLD" OFF)
find_package(llvm) find_package(llvm)
include_directories(${LLVM_INCLUDE_DIRS})
find_package(clang) find_package(clang)
include_directories(${CLANG_INCLUDE_DIRS})
if(ZIG_FORCE_EXTERNAL_LLD) if(ZIG_FORCE_EXTERNAL_LLD)
find_package(lld) find_package(lld)
include_directories(${LLVM_INCLUDE_DIRS})
include_directories(${LLD_INCLUDE_DIRS}) include_directories(${LLD_INCLUDE_DIRS})
include_directories(${CLANG_INCLUDE_DIRS})
else() else()
# This goes first so that we find embedded LLD instead
# of system LLD.
include_directories("${CMAKE_SOURCE_DIR}/deps/lld/include")
include_directories(${LLVM_INCLUDE_DIRS})
include_directories(${CLANG_INCLUDE_DIRS})
set(EMBEDDED_LLD_LIB_SOURCES set(EMBEDDED_LLD_LIB_SOURCES
"${CMAKE_SOURCE_DIR}/deps/lld/lib/Driver/DarwinLdDriver.cpp" "${CMAKE_SOURCE_DIR}/deps/lld/lib/Driver/DarwinLdDriver.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/lib/Config/Version.cpp" "${CMAKE_SOURCE_DIR}/deps/lld/lib/Config/Version.cpp"

2
src/zig_llvm.cpp
View File

@ -789,7 +789,7 @@ bool ZigLLDLink(ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_
zig_unreachable(); zig_unreachable();
case ZigLLVM_COFF: case ZigLLVM_COFF:
return lld::coff::link(array_ref_args); return lld::coff::link(array_ref_args, false, diag);
case ZigLLVM_ELF: case ZigLLVM_ELF:
return lld::elf::link(array_ref_args, false, diag); return lld::elf::link(array_ref_args, false, diag);