From 57ac835a03b77a14a218daf250d33f580cd6f484 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 30 Nov 2020 18:12:07 -0700 Subject: [PATCH] Merge branch 'alexnask-fix_6868' into master Closes #7139 Closes #6868 --- lib/std/build.zig | 9 +++------ lib/std/os.zig | 1 + src/main.zig | 3 +++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/std/build.zig b/lib/std/build.zig index 4c308ba823..d23c5b2865 100644 --- a/lib/std/build.zig +++ b/lib/std/build.zig @@ -1977,13 +1977,10 @@ pub const LibExeObjStep = struct { try zig_args.append(other.getOutputPath()); }, .Lib => { - if (!other.is_dynamic or self.target.isWindows()) { - try zig_args.append(other.getOutputLibPath()); - } else { - const full_path_lib = other.getOutputPath(); - try zig_args.append("--library"); - try zig_args.append(full_path_lib); + const full_path_lib = other.getOutputPath(); + try zig_args.append(full_path_lib); + if (other.is_dynamic and !self.target.isWindows()) { if (fs.path.dirname(full_path_lib)) |dirname| { try zig_args.append("-rpath"); try zig_args.append(dirname); diff --git a/lib/std/os.zig b/lib/std/os.zig index 2ea26f8b1e..f558e900d8 100644 --- a/lib/std/os.zig +++ b/lib/std/os.zig @@ -3734,6 +3734,7 @@ pub fn faccessatW(dirfd: fd_t, sub_path_w: [*:0]const u16, mode: u32, flags: u32 .SUCCESS => return, .OBJECT_NAME_NOT_FOUND => return error.FileNotFound, .OBJECT_PATH_NOT_FOUND => return error.FileNotFound, + .OBJECT_NAME_INVALID => unreachable, .INVALID_PARAMETER => unreachable, .ACCESS_DENIED => return error.PermissionDenied, .OBJECT_PATH_SYNTAX_BAD => unreachable, diff --git a/src/main.zig b/src/main.zig index e6f5fd2000..885758f19e 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1383,6 +1383,9 @@ fn buildOutputType( _ = system_libs.orderedRemove(i); continue; } + if (std.fs.path.isAbsolute(lib_name)) { + fatal("cannot use absolute path as a system library: {s}", .{lib_name}); + } i += 1; } }