Add allGhcOptExtra from all *-options

Add test for capi

Add #if for GHC >=810

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,10 +19,11 @@ import Distribution.Types.Component
 import Distribution.Types.TargetInfo
 
 import Distribution.Simple.Build.Inputs
+import Distribution.Simple.BuildPaths
 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
@@ -73,7 +74,16 @@ buildCSources
 buildCSources mbMainFile =
   buildExtraSources
     "C Sources"
-    Internal.componentCcGhcOptions
+    ( \verbosity lbi bi clbi odir filename ->
+        Internal.commonAdditionalGhcOptions verbosity lbi bi clbi odir filename
+          <> mempty
+            { ghcOptCcOptions = Internal.optimizationCFLags lbi ++ ccOptions bi
+            , ghcOptCcProgram =
+                maybeToFlag $
+                  programPath
+                    <$> lookupProgram gccProgram (withPrograms lbi)
+            }
+    )
     ( \c -> do
         let cFiles = cSources (componentBuildInfo c)
         case c of
@@ -86,7 +96,16 @@ buildCSources mbMainFile =
 buildCxxSources mbMainFile =
   buildExtraSources
     "C++ Sources"
-    Internal.componentCxxGhcOptions
+    ( \verbosity lbi bi clbi odir filename ->
+        Internal.commonAdditionalGhcOptions verbosity lbi bi clbi odir filename
+          <> mempty
+            { ghcOptCxxOptions = Internal.optimizationCFLags lbi ++ cxxOptions bi
+            , ghcOptCcProgram =
+                maybeToFlag $
+                  programPath
+                    <$> lookupProgram gccProgram (withPrograms lbi)
+            }
+    )
     ( \c -> do
         let cxxFiles = cxxSources (componentBuildInfo c)
         case c of
@@ -101,7 +120,12 @@ buildJsSources _mbMainFile ghcProg buildTargetDir neededWays = do
   let hasJsSupport = hostArch == JavaScript
   buildExtraSources
     "JS Sources"
-    Internal.componentJsGhcOptions
+    ( \verbosity lbi bi clbi odir filename ->
+        Internal.commonAdditionalGhcOptions verbosity lbi bi clbi odir filename
+          <> mempty
+            { ghcOptJSppOptions = jsppOptions bi
+            }
+    )
     ( \c ->
         if hasJsSupport
           then -- JS files are C-like with GHC's JS backend: they are
@@ -117,12 +141,26 @@ buildJsSources _mbMainFile ghcProg buildTargetDir neededWays = do
 buildAsmSources _mbMainFile =
   buildExtraSources
     "Assembler Sources"
-    Internal.componentAsmGhcOptions
+    ( \verbosity lbi bi clbi odir filename ->
+        Internal.commonAdditionalGhcOptions verbosity lbi bi clbi odir filename
+          <> mempty
+            { ghcOptAsmOptions = Internal.optimizationCFLags lbi ++ asmOptions bi
+            }
+    )
     (asmSources . componentBuildInfo)
 buildCmmSources _mbMainFile =
   buildExtraSources
     "C-- Sources"
-    Internal.componentCmmGhcOptions
+    ( \verbosity lbi bi clbi odir filename ->
+        Internal.commonAdditionalGhcOptions verbosity lbi bi clbi odir filename
+          <> mempty
+            { ghcOptCppOptions = cppOptions bi
+            , ghcOptCppIncludes =
+                toNubListR $
+                  [autogenComponentModulesDir lbi clbi </> makeRelativePathEx cppHeaderName]
+            , ghcOptExtra = cmmOptions bi
+            }
+    )
     (cmmSources . componentBuildInfo)
 
 -- | Create 'PreBuildComponentRules' for a given type of extra build sources
@@ -140,9 +178,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 +247,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/Modules.hs

@@ -178,7 +178,7 @@ buildHaskellModules numJobs ghcProg mbMainFile inputModules buildTargetDir neede
           , ghcOptInputModules = toNubListR inputModules
           , ghcOptInputFiles = toNubListR hsMains
           , ghcOptInputScripts = toNubListR scriptMains
-          , ghcOptExtra = buildWayExtraHcOptions way GHC bi
+          , ghcOptExtra = buildWayExtraHcOptions way GHC bi <> Internal.allGhcOptExtra bi (compiler lbi)
           , ghcOptHiSuffix = optSuffixFlag (buildWayPrefix way) "hi"
           , ghcOptObjSuffix = optSuffixFlag (buildWayPrefix way) "o"
           , ghcOptHPCDir = hpcdir (buildWayHpcWay way) -- maybe this should not be passed for vanilla?