Fix statically linking executables wrt haskell#11224

By supporting GHCs '-static-external'

Author: hasufell

Cabal/src/Distribution/Simple/GHC/Build/Link.hs

@@ -120,17 +120,17 @@ linkOrLoadComponent
       -- for foreign libs in the three cases where we use `withFullyStaticExe` below?
       linkerOpts rpaths =
         mempty
-          { ghcOptLinkOptions =
-              PD.ldOptions bi
-                ++ [ "-static"
-                   | withFullyStaticExe lbi
-                   ]
-                -- Pass extra `ld-options` given
-                -- through to GHC's linker.
-                ++ maybe
-                  []
-                  programOverrideArgs
-                  (lookupProgram ldProgram (withPrograms lbi))
+          { ghcOptExtraDefault =
+              [ "-static-external"
+              | withFullyStaticExe lbi
+              ]
+          , ghcOptLinkOptions =
+              -- Pass extra `ld-options` given
+              -- through to GHC's linker.
+              maybe
+                []
+                programOverrideArgs
+                (lookupProgram ldProgram (withPrograms lbi))
           , ghcOptLinkLibs =
               if withFullyStaticExe lbi
                 then extraLibsStatic bi
@@ -226,7 +226,7 @@ linkOrLoadComponent
                 CLib lib -> do
                   let libWays = wantedLibWays isIndef
                   rpaths <- get_rpaths (Set.fromList libWays)
-                  linkLibrary buildTargetDir cleanedExtraLibDirs pkg_descr verbosity runGhcProg lib lbi clbi extraSources rpaths libWays
+                  linkLibrary buildTargetDir cleanedExtraLibDirs cleanedExtraLibDirsStatic pkg_descr verbosity runGhcProg lib lbi clbi extraSources rpaths libWays
                 CFLib flib -> do
                   let flib_way = wantedFLibWay (withDynFLib flib)
                   rpaths <- get_rpaths (Set.singleton flib_way)
@@ -241,6 +241,8 @@ linkLibrary
   -- ^ The library target build directory
   -> [SymbolicPath Pkg (Dir Lib)]
   -- ^ The list of extra lib dirs that exist (aka "cleaned")
+  -> [SymbolicPath Pkg (Dir Lib)]
+  -- ^ The list of extra static lib dirs that exist (aka "cleaned")
   -> PackageDescription
   -- ^ The package description containing this library
   -> Verbosity
@@ -256,7 +258,7 @@ linkLibrary
   -> [BuildWay]
   -- ^ Wanted build ways and corresponding build options
   -> IO ()
-linkLibrary buildTargetDir cleanedExtraLibDirs pkg_descr verbosity runGhcProg lib lbi clbi extraSources rpaths wantedWays = do
+linkLibrary buildTargetDir cleanedExtraLibDirs cleanedExtraLibDirsStatic pkg_descr verbosity runGhcProg lib lbi clbi extraSources rpaths wantedWays = do
   let
     common = configCommonFlags $ configFlags lbi
     mbWorkDir = flagToMaybe $ setupWorkingDir common
@@ -432,8 +434,7 @@ linkLibrary buildTargetDir cleanedExtraLibDirs pkg_descr verbosity runGhcProg li
         , ghcOptInputFiles = toNubListR $ map coerceSymbolicPath staticObjectFiles
         , ghcOptOutputFile = toFlag staticLibFilePath
         , ghcOptLinkLibs = extraLibs libBi
-        , -- TODO: Shouldn't this use cleanedExtraLibDirsStatic instead?
-          ghcOptLinkLibPath = toNubListR $ cleanedExtraLibDirs
+        , ghcOptLinkLibPath = toNubListR $ cleanedExtraLibDirsStatic
         }
 
   staticObjectFiles <- getObjFiles StaticWay