From 9d1816111d1d30e18b8cb43a4aa31c194fb204c4 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Mon, 30 Nov 2020 18:11:07 -0700
Subject: [PATCH] build system: pass dyn lib artifacts as positionals

---
 lib/std/build.zig | 9 +++------
 src/main.zig      | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/std/build.zig b/lib/std/build.zig
index c8439ca20a..a658e1f057 100644
--- a/lib/std/build.zig
+++ b/lib/std/build.zig
@@ -1980,13 +1980,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/src/main.zig b/src/main.zig
index ac1b852b7d..b6858588e9 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -1402,7 +1402,7 @@ fn buildOutputType(
                 continue;
             }
             if (std.fs.path.isAbsolute(lib_name)) {
-                fatal("cannot use absolute path as a system library: {}", .{lib_name});
+                fatal("cannot use absolute path as a system library: {s}", .{lib_name});
             }
             i += 1;
         }