Merge #186941: staging-next 2022-08-16

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 2990afde3e9a..8f579368d6d3 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -65,11 +65,17 @@ rec {
         # is why we use the more obscure "bfd" and not "binutils" for this
         # choice.
         else                                     "bfd";
-      extensions = {
+      extensions = rec {
         sharedLibrary =
           /**/ if final.isDarwin  then ".dylib"
           else if final.isWindows then ".dll"
           else                         ".so";
+        staticLibrary =
+          /**/ if final.isWindows then ".lib"
+          else                         ".a";
+        library =
+          /**/ if final.isStatic then staticLibrary
+          else                        sharedLibrary;
         executable =
           /**/ if final.isWindows then ".exe"
           else                         "";