Unverified Commit 7363eedd authored by Adam Joseph's avatar Adam Joseph Committed by GitHub
Browse files

Merge pull request #244118 from amjoseph-nixpkgs/pr/fix/244045

lib.systems.extensions.sharedLibrary: do not `throw`
parents bbcc7274 d278fd78
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -85,17 +85,18 @@ rec {
        # is why we use the more obscure "bfd" and not "binutils" for this
        # choice.
        else                                     "bfd";
      extensions = rec {
        sharedLibrary = assert final.hasSharedLibraries;
          /**/ if final.isDarwin  then ".dylib"
      extensions = lib.optionalAttrs final.hasSharedLibraries {
        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;
          /**/ if final.isStatic then final.extensions.staticLibrary
          else                        final.extensions.sharedLibrary;
        executable =
          /**/ if final.isWindows then ".exe"
          else                         "";