Commit cf96b6f87b5feaa699f0d15b1525d53a374b6227 | zig

author	Andrew Kelley <andrew@ziglang.org> 2017-12-01 13:44:28-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2017-12-01 13:44:28-05:00
log	cf96b6f87b5feaa699f0d15b1525d53a374b6227
tree	6d2c75762c3e08dd686710666f8208fa1406be6c
parent	bdd5241615bf41b69d3e12f3b6796bd796fb90f2

2 files changed, 9 insertions(+), 4 deletions(-)

CMakeLists.txt+8-3

...	...	@@ -47,15 +47,20 @@ option(ZIG_TEST_COVERAGE "Build Zig with test coverage instrumentation" OFF)
47	47	option(ZIG_FORCE_EXTERNAL_LLD "If your system has the LLD patches use it instead of the embedded LLD" OFF)
48	48
49	49	find_package(llvm)
50		include_directories(${LLVM_INCLUDE_DIRS})
51
52	50	find_package(clang)
53		include_directories(${CLANG_INCLUDE_DIRS})
54	51
55	52	if(ZIG_FORCE_EXTERNAL_LLD)
56	53	find_package(lld)
	54	include_directories(${LLVM_INCLUDE_DIRS})
57	55	include_directories(${LLD_INCLUDE_DIRS})
	56	include_directories(${CLANG_INCLUDE_DIRS})
58	57	else()
	58	# This goes first so that we find embedded LLD instead
	59	# of system LLD.
	60	include_directories("${CMAKE_SOURCE_DIR}/deps/lld/include")
	61
	62	include_directories(${LLVM_INCLUDE_DIRS})
	63	include_directories(${CLANG_INCLUDE_DIRS})
59	64	set(EMBEDDED_LLD_LIB_SOURCES
60	65	"${CMAKE_SOURCE_DIR}/deps/lld/lib/Driver/DarwinLdDriver.cpp"
61	66	"${CMAKE_SOURCE_DIR}/deps/lld/lib/Config/Version.cpp"

src/zig_llvm.cpp+1-1

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