Commit 234030c37a97d3da7bc6325e4dfb32fe37e9b039 | zig

author	Andrew Kelley <andrew@ziglang.org> 2017-08-08 16:41:06-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2017-08-26 00:34:40-04:00
log	234030c37a97d3da7bc6325e4dfb32fe37e9b039
tree	6f973a7d68d8bd1aa84e8ad54d7b8d4bc7fee8e6
parent	8f57544410f80d336d1af2bea46812f81e505d72

4 files changed, 8 insertions(+), 8 deletions(-)

README.md+1-1

...	...	@@ -76,7 +76,7 @@ the Zig compiler itself:
76	76	These libraries must be installed on your system, with the development files
77	77	available. The Zig compiler links against them.
78	78
79		* LLVM, Clang, and LLD libraries == 4.x
	79	* LLVM, Clang, and LLD libraries == 5.x
80	80
81	81	### Debug / Development Build
82	82

cmake/Findclang.cmake+2-2

...	...	@@ -8,14 +8,14 @@
8	8
9	9	find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
10	10	PATHS
11		/usr/lib/llvm-4.0/include
	11	/usr/lib/llvm-5.0/include
12	12	/mingw64/include)
13	13
14	14	macro(FIND_AND_ADD_CLANG_LIB _libname_)
15	15	string(TOUPPER ${_libname_} _prettylibname_)
16	16	find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
17	17	PATHS
18		/usr/lib/llvm-4.0/lib
	18	/usr/lib/llvm-5.0/lib
19	19	/mingw64/lib
20	20	/c/msys64/mingw64/lib
21	21	c:\\msys64\\mingw64\\lib)

cmake/Findlld.cmake+3-3

...	...	@@ -8,10 +8,10 @@
8	8
9	9	find_path(LLD_INCLUDE_DIRS NAMES lld/Driver/Driver.h
10	10	PATHS
11		/usr/lib/llvm-4.0/include
	11	/usr/lib/llvm-5.0/include
12	12	/mingw64/include)
13	13
14		find_library(LLD_LIBRARY NAMES lld-4.0 lld PATHS /usr/lib/llvm-4.0/lib)
	14	find_library(LLD_LIBRARY NAMES lld-5.0 lld PATHS /usr/lib/llvm-5.0/lib)
15	15	if(EXISTS ${LLD_LIBRARY})
16	16	set(LLD_LIBRARIES ${LLD_LIBRARY})
17	17	else()
...	...	@@ -19,7 +19,7 @@ else()
19	19	string(TOUPPER ${_libname_} _prettylibname_)
20	20	find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
21	21	PATHS
22		/usr/lib/llvm-4.0/lib
	22	/usr/lib/llvm-5.0/lib
23	23	/mingw64/lib
24	24	/c/msys64/mingw64/lib
25	25	c:/msys64/mingw64/lib)

cmake/Findllvm.cmake+2-2

...	...	@@ -8,12 +8,12 @@
8	8	# LLVM_LIBDIRS
9	9
10	10	find_program(LLVM_CONFIG_EXE
11		NAMES llvm-config llvm-config-4.0
	11	NAMES llvm-config llvm-config-5.0
12	12	PATHS
13	13	"/mingw64/bin"
14	14	"/c/msys64/mingw64/bin"
15	15	"c:/msys64/mingw64/bin"
16		"C:/Libraries/llvm-4.0.0/bin")
	16	"C:/Libraries/llvm-5.0.0/bin")
17	17
18	18	execute_process(
19	19	COMMAND ${LLVM_CONFIG_EXE} --libs