Commit 7a829a70152522551610c692fe2253b2197ddb66 | zig

author	Michael Neumann <mneumann@ntecs.de> 2020-04-07 17:13:33+02:00
committer	Michael Neumann <mneumann@ntecs.de> 2020-04-07 17:13:33+02:00
log	7a829a70152522551610c692fe2253b2197ddb66
tree	1d58868a27a33955e64b62b5c0f7ebfcbe4b293d
parent	ab05766674b88dc7715d27f7d590d6832ee005ca

3 files changed, 8 insertions(+), 1 deletions(-)

cmake/Findclang.cmake+2

...	...	@@ -13,6 +13,7 @@ find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
13	13	/usr/lib/llvm-10/include
14	14	/usr/lib/llvm-10.0/include
15	15	/usr/local/llvm100/include
	16	/usr/local/llvm10/include
16	17	/mingw64/include)
17	18
18	19	macro(FIND_AND_ADD_CLANG_LIB _libname_)
...	...	@@ -24,6 +25,7 @@ macro(FIND_AND_ADD_CLANG_LIB _libname_)
24	25	/usr/lib/llvm-10/lib
25	26	/usr/lib/llvm-10.0/lib
26	27	/usr/local/llvm100/lib
	28	/usr/local/llvm10/lib
27	29	/mingw64/lib
28	30	/c/msys64/mingw64/lib
29	31	c:\\msys64\\mingw64\\lib)

cmake/Findlld.cmake+3

...	...	@@ -10,12 +10,14 @@ find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
10	10	PATHS
11	11	/usr/lib/llvm-10/include
12	12	/usr/local/llvm100/include
	13	/usr/local/llvm10/include
13	14	/mingw64/include)
14	15
15	16	find_library(LLD_LIBRARY NAMES lld-10.0 lld100 lld
16	17	PATHS
17	18	/usr/lib/llvm-10/lib
18	19	/usr/local/llvm100/lib
	20	/usr/local/llvm10/lib
19	21	)
20	22	if(EXISTS ${LLD_LIBRARY})
21	23	set(LLD_LIBRARIES ${LLD_LIBRARY})
...	...	@@ -27,6 +29,7 @@ else()
27	29	${LLD_LIBDIRS}
28	30	/usr/lib/llvm-10/lib
29	31	/usr/local/llvm100/lib
	32	/usr/local/llvm10/lib
30	33	/mingw64/lib
31	34	/c/msys64/mingw64/lib
32	35	c:/msys64/mingw64/lib)

cmake/Findllvm.cmake+3-1

...	...	@@ -9,7 +9,7 @@
9	9
10	10	if("${ZIG_TARGET_TRIPLE}" STREQUAL "native")
11	11	find_program(LLVM_CONFIG_EXE
12		NAMES llvm-config-10 llvm-config-10.0 llvm-config100 llvm-config
	12	NAMES llvm-config-10 llvm-config-10.0 llvm-config100 llvm-config10 llvm-config
13	13	PATHS
14	14	"/mingw64/bin"
15	15	"/c/msys64/mingw64/bin"
...	...	@@ -130,6 +130,7 @@ else()
130	130	/usr/lib/llvm-10/include
131	131	/usr/lib/llvm-10.0/include
132	132	/usr/local/llvm100/include
	133	/usr/local/llvm10/include
133	134	/mingw64/include)
134	135
135	136	macro(FIND_AND_ADD_LLVM_LIB _libname_)
...	...	@@ -141,6 +142,7 @@ else()
141	142	/usr/lib/llvm-10/lib
142	143	/usr/lib/llvm-10.0/lib
143	144	/usr/local/llvm100/lib
	145	/usr/local/llvm10/lib
144	146	/mingw64/lib
145	147	/c/msys64/mingw64/lib
146	148	c:\\msys64\\mingw64\\lib)