Commit 57ac835a03b77a14a218daf250d33f580cd6f484 | zig

author	Andrew Kelley <andrew@ziglang.org> 2020-11-30 18:12:07-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-11-30 18:13:06-07:00
log	57ac835a03b77a14a218daf250d33f580cd6f484
tree	2c61d08303e27b8c1ea90a0554339d9d336b755f
parent	3c907e51d1d3e075589cc3d7279b935ab33e5e82

Closes #7139
Closes #6868

3 files changed, 7 insertions(+), 6 deletions(-)

lib/std/build.zig+3-6

...	...	@@ -1977,13 +1977,10 @@ pub const LibExeObjStep = struct {
1977	1977	try zig_args.append(other.getOutputPath());
1978	1978	},
1979	1979	.Lib => {
1980		if (!other.is_dynamic or self.target.isWindows()) {
1981		try zig_args.append(other.getOutputLibPath());
1982		} else {
1983		const full_path_lib = other.getOutputPath();
1984		try zig_args.append("--library");
1985		try zig_args.append(full_path_lib);
	1980	const full_path_lib = other.getOutputPath();
	1981	try zig_args.append(full_path_lib);
1986	1982
	1983	if (other.is_dynamic and !self.target.isWindows()) {
1987	1984	if (fs.path.dirname(full_path_lib)) \|dirname\| {
1988	1985	try zig_args.append("-rpath");
1989	1986	try zig_args.append(dirname);

lib/std/os.zig+1

...	...	@@ -3734,6 +3734,7 @@ pub fn faccessatW(dirfd: fd_t, sub_path_w: [*:0]const u16, mode: u32, flags: u32
3734	3734	.SUCCESS => return,
3735	3735	.OBJECT_NAME_NOT_FOUND => return error.FileNotFound,
3736	3736	.OBJECT_PATH_NOT_FOUND => return error.FileNotFound,
	3737	.OBJECT_NAME_INVALID => unreachable,
3737	3738	.INVALID_PARAMETER => unreachable,
3738	3739	.ACCESS_DENIED => return error.PermissionDenied,
3739	3740	.OBJECT_PATH_SYNTAX_BAD => unreachable,

src/main.zig+3

...	...	@@ -1383,6 +1383,9 @@ fn buildOutputType(
1383	1383	_ = system_libs.orderedRemove(i);
1384	1384	continue;
1385	1385	}
	1386	if (std.fs.path.isAbsolute(lib_name)) {
	1387	fatal("cannot use absolute path as a system library: {s}", .{lib_name});
	1388	}
1386	1389	i += 1;
1387	1390	}
1388	1391	}