Commit a20f3e3f02b24219f43c2da4568b794051e7d348 | zig

author	Andrew Kelley <andrew@ziglang.org> 2020-04-07 13:04:37-04:00
committer	GitHub <noreply@github.com> 2020-04-07 13:04:37-04:00
log	a20f3e3f02b24219f43c2da4568b794051e7d348
tree	c16b2d6ef4dad8fdf28543b0e1a0ab23d15b2348
parent	ab05766674b88dc7715d27f7d590d6832ee005ca
parent	2b9cef1e0414f01e024af6f69a885faaeaa95f7c
signature	Signed by PGP key 4AEE18F83AFDEB23

Fix compile on Dragonfly

4 files changed, 14 insertions(+), 2 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)

lib/std/os/bits/dragonfly.zig+6-1

...	...	@@ -244,6 +244,12 @@ pub const KERN_MAXID = 37;
244	244
245	245	pub const HOST_NAME_MAX = 255;
246	246
	247	// access function
	248	pub const F_OK = 0; // test for existence of file
	249	pub const X_OK = 1; // test for execute or search permission
	250	pub const W_OK = 2; // test for write permission
	251	pub const R_OK = 4; // test for read permission
	252
247	253	pub const O_RDONLY = 0;
248	254	pub const O_NDELAY = O_NONBLOCK;
249	255	pub const O_WRONLY = 1;
...	...	@@ -277,7 +283,6 @@ pub const SEEK_END = 2;
277	283	pub const SEEK_DATA = 3;
278	284	pub const SEEK_HOLE = 4;
279	285
280		pub const F_OK = 0;
281	286	pub const F_ULOCK = 0;
282	287	pub const F_LOCK = 1;
283	288	pub const F_TLOCK = 2;