Merging all resource flags.

All resource options now use base options.

Add test for FFI/ForeignOptsCapi.

Update test ShowBuildInfo/Complex.

Author: zlonast

Cabal/src/Distribution/Simple/GHC.hs

@@ -58,7 +58,6 @@ module Distribution.Simple.GHC
   , hcPkgInfo
   , registerPackage
   , Internal.componentGhcOptions
-  , Internal.componentCcGhcOptions
   , getGhcAppDir
   , getLibDir
   , compilerBuildWay
@@ -744,7 +743,7 @@ libAbiHash verbosity _pkg_descr lbi lib clbi = do
           , ghcOptFPic = toFlag True
           , ghcOptHiSuffix = toFlag "dyn_hi"
           , ghcOptObjSuffix = toFlag "dyn_o"
-          , ghcOptExtra = hcOptions GHC libBi ++ hcSharedOptions GHC libBi
+          , ghcOptExtra = hcSharedOptions GHC libBi
           }
     profArgs =
       vanillaArgs
@@ -756,7 +755,7 @@ libAbiHash verbosity _pkg_descr lbi lib clbi = do
                 (withProfLibDetail lbi)
           , ghcOptHiSuffix = toFlag "p_hi"
           , ghcOptObjSuffix = toFlag "p_o"
-          , ghcOptExtra = hcOptions GHC libBi ++ hcProfOptions GHC libBi
+          , ghcOptExtra = hcProfOptions GHC libBi
           }
     profDynArgs =
       vanillaArgs
@@ -770,7 +769,7 @@ libAbiHash verbosity _pkg_descr lbi lib clbi = do
           , ghcOptFPic = toFlag True
           , ghcOptHiSuffix = toFlag "p_dyn_hi"
           , ghcOptObjSuffix = toFlag "p_dyn_o"
-          , ghcOptExtra = hcOptions GHC libBi ++ hcProfSharedOptions GHC libBi
+          , ghcOptExtra = hcProfSharedOptions GHC libBi
           }
     ghcArgs =
       let (libWays, _, _) = buildWays lbi

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

@@ -19,15 +19,17 @@ import Distribution.Types.Component
 import Distribution.Types.TargetInfo
 
 import Distribution.Simple.Build.Inputs
+import Distribution.Simple.Compiler
 import Distribution.Simple.GHC.Build.Modules
 import Distribution.Simple.GHC.Build.Utils
 import Distribution.Simple.LocalBuildInfo
-import Distribution.Simple.Program.Types
+import Distribution.Simple.Program
 import Distribution.Simple.Setup.Common (commonSetupTempFileOptions)
 import Distribution.System (Arch (JavaScript), Platform (..))
 import Distribution.Types.ComponentLocalBuildInfo
 import Distribution.Utils.Path
 import Distribution.Verbosity (Verbosity)
+import Distribution.Version
 
 -- | An action that builds all the extra build sources of a component, i.e. C,
 -- C++, Js, Asm, C-- sources.
@@ -73,7 +75,21 @@ buildCSources
 buildCSources mbMainFile =
   buildExtraSources
     "C Sources"
-    Internal.componentCcGhcOptions
+    ( \verbosity lbi bi clbi odir filename ->
+        (Internal.sourcesGhcOptions verbosity lbi bi clbi odir filename)
+          { ghcOptCxxOptions =
+              ( case compilerCompatVersion GHC (compiler lbi) of
+                  Just v
+                    | v >= mkVersion [8, 10] -> Internal.defaultGhcOptCxxOptions lbi bi
+                  Just _ -> []
+                  Nothing -> []
+              )
+          , ghcOptCcProgram =
+              maybeToFlag $
+                programPath
+                  <$> lookupProgram gccProgram (withPrograms lbi)
+          }
+    )
     ( \c -> do
         let cFiles = cSources (componentBuildInfo c)
         case c of
@@ -86,7 +102,21 @@ buildCSources mbMainFile =
 buildCxxSources mbMainFile =
   buildExtraSources
     "C++ Sources"
-    Internal.componentCxxGhcOptions
+    ( \verbosity lbi bi clbi odir filename ->
+        (Internal.sourcesGhcOptions verbosity lbi bi clbi odir filename)
+          { ghcOptCcOptions =
+              ( case compilerCompatVersion GHC (compiler lbi) of
+                  Just v
+                    | v >= mkVersion [8, 10] -> Internal.defaultGhcOptCcOptions lbi bi
+                  Just _ -> []
+                  Nothing -> []
+              )
+          , ghcOptCcProgram =
+              maybeToFlag $
+                programPath
+                  <$> lookupProgram gccProgram (withPrograms lbi)
+          }
+    )
     ( \c -> do
         let cxxFiles = cxxSources (componentBuildInfo c)
         case c of
@@ -101,7 +131,7 @@ buildJsSources _mbMainFile ghcProg buildTargetDir neededWays = do
   let hasJsSupport = hostArch == JavaScript
   buildExtraSources
     "JS Sources"
-    Internal.componentJsGhcOptions
+    Internal.sourcesGhcOptions
     ( \c ->
         if hasJsSupport
           then -- JS files are C-like with GHC's JS backend: they are
@@ -117,12 +147,12 @@ buildJsSources _mbMainFile ghcProg buildTargetDir neededWays = do
 buildAsmSources _mbMainFile =
   buildExtraSources
     "Assembler Sources"
-    Internal.componentAsmGhcOptions
+    Internal.sourcesGhcOptions
     (asmSources . componentBuildInfo)
 buildCmmSources _mbMainFile =
   buildExtraSources
     "C-- Sources"
-    Internal.componentCmmGhcOptions
+    Internal.sourcesGhcOptions
     (cmmSources . componentBuildInfo)
 
 -- | Create 'PreBuildComponentRules' for a given type of extra build sources
@@ -140,9 +170,7 @@ buildExtraSources
        -> GhcOptions
      )
   -- ^ Function to determine the @'GhcOptions'@ for the
-  -- invocation of GHC when compiling these extra sources (e.g.
-  -- @'Internal.componentCxxGhcOptions'@,
-  -- @'Internal.componentCmmGhcOptions'@)
+  -- invocation of GHC when compiling these extra sources
   -> (Component -> [SymbolicPath Pkg File])
   -- ^ View the extra sources of a component, typically from
   -- the build info (e.g. @'asmSources'@, @'cSources'@).
@@ -211,14 +239,12 @@ buildExtraSources
               sharedSrcOpts =
                 vanillaSrcOpts
                   `mappend` mempty
-                    { ghcOptFPic = toFlag True
-                    , ghcOptDynLinkMode = toFlag GhcDynamicOnly
+                    { ghcOptDynLinkMode = toFlag GhcDynamicOnly
                     }
               profSharedSrcOpts =
                 vanillaSrcOpts
                   `mappend` mempty
                     { ghcOptProfilingMode = toFlag True
-                    , ghcOptFPic = toFlag True
                     , ghcOptDynLinkMode = toFlag GhcDynamicOnly
                     }
               -- TODO: Placing all Haskell, C, & C++ objects in a single directory

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

@@ -118,10 +118,9 @@ linkOrLoadComponent
       linkerOpts rpaths =
         mempty
           { ghcOptLinkOptions =
-              PD.ldOptions bi
-                ++ [ "-static"
-                   | withFullyStaticExe lbi
-                   ]
+              [ "-static"
+              | withFullyStaticExe lbi
+              ]
                 -- Pass extra `ld-options` given
                 -- through to GHC's linker.
                 ++ maybe