Add allGhcOptExtra from all *-options

Author: zlonast

Cabal/src/Distribution/Simple/GHC.hs

@@ -744,7 +744,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 = Internal.allGhcOptExtra libBi <> hcOptions GHC libBi ++ hcSharedOptions GHC libBi
           }
     profArgs =
       vanillaArgs
@@ -756,7 +756,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 = Internal.allGhcOptExtra libBi <> hcOptions GHC libBi ++ hcProfOptions GHC libBi
           }
     profDynArgs =
       vanillaArgs
@@ -770,7 +770,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 = Internal.allGhcOptExtra libBi <> hcOptions GHC libBi ++ hcProfSharedOptions GHC libBi
           }
     ghcArgs =
       let (libWays, _, _) = buildWays lbi

Cabal/src/Distribution/Simple/GHC/Internal.hs

@@ -35,6 +35,7 @@ module Distribution.Simple.GHC.Internal
   , substTopDir
   , checkPackageDbEnvVar
   , profDetailLevelFlag
+  , allGhcOptExtra
 
     -- * GHC platform and version strings
   , ghcArchString
@@ -377,6 +378,15 @@ includePaths lbi bi clbi odir =
          | dir <- mapMaybe (symbolicPathRelative_maybe . unsafeCoerceSymbolicPath) $ includeDirs bi
          ]
 
+allGhcOptExtra :: BuildInfo -> [String]
+allGhcOptExtra bi =
+  ["-optP" ++ opt | opt <- cppOptions bi]
+    ++ ["-optc" ++ opt | opt <- ccOptions bi]
+    ++ ["-optcxx" ++ opt | opt <- cxxOptions bi]
+    ++ ["-opta" ++ opt | opt <- asmOptions bi]
+    ++ ["-optl" ++ opt | opt <- ldOptions bi]
+    ++ ["-optJSP" ++ opt | opt <- jsppOptions bi]
+
 componentCcGhcOptions
   :: Verbosity
   -> LocalBuildInfo
@@ -413,7 +423,7 @@ componentCcGhcOptions verbosity lbi bi clbi odir filename =
           programPath
             <$> lookupProgram gccProgram (withPrograms lbi)
     , ghcOptObjDir = toFlag odir
-    , ghcOptExtra = hcOptions GHC bi
+    , ghcOptExtra = allGhcOptExtra bi <> hcOptions GHC bi
     }
 
 componentCxxGhcOptions
@@ -452,7 +462,7 @@ componentCxxGhcOptions verbosity lbi bi clbi odir filename =
           programPath
             <$> lookupProgram gccProgram (withPrograms lbi)
     , ghcOptObjDir = toFlag odir
-    , ghcOptExtra = hcOptions GHC bi
+    , ghcOptExtra = allGhcOptExtra bi <> hcOptions GHC bi
     }
 
 componentAsmGhcOptions
@@ -487,7 +497,7 @@ componentAsmGhcOptions verbosity lbi bi clbi odir filename =
              )
           ++ asmOptions bi
     , ghcOptObjDir = toFlag odir
-    , ghcOptExtra = hcOptions GHC bi
+    , ghcOptExtra = allGhcOptExtra bi <> hcOptions GHC bi
     }
 
 componentJsGhcOptions
@@ -511,7 +521,7 @@ componentJsGhcOptions verbosity lbi bi clbi odir filename =
     , ghcOptPackageDBs = withPackageDB lbi
     , ghcOptPackages = toNubListR $ mkGhcOptPackages (promisedPkgs lbi) clbi
     , ghcOptObjDir = toFlag odir
-    , ghcOptExtra = hcOptions GHC bi
+    , ghcOptExtra = allGhcOptExtra bi <> hcOptions GHC bi
     }
 
 componentGhcOptions
@@ -581,7 +591,7 @@ componentGhcOptions verbosity lbi bi clbi odir =
         , ghcOptOutputDir = toFlag $ coerceSymbolicPath odir
         , ghcOptOptimisation = toGhcOptimisation (withOptimization lbi)
         , ghcOptDebugInfo = toFlag (withDebugInfo lbi)
-        , ghcOptExtra = hcOptions GHC bi
+        , ghcOptExtra = allGhcOptExtra bi <> hcOptions GHC bi
         , ghcOptExtraPath = toNubListR exe_paths
         , ghcOptLanguage = toFlag (fromMaybe Haskell98 (defaultLanguage bi))
         , -- Unsupported extensions have already been checked by configure
@@ -626,7 +636,7 @@ componentCmmGhcOptions verbosity lbi bi clbi odir filename =
     , ghcOptPackages = toNubListR $ mkGhcOptPackages (promisedPkgs lbi) clbi
     , ghcOptOptimisation = toGhcOptimisation (withOptimization lbi)
     , ghcOptDebugInfo = toFlag (withDebugInfo lbi)
-    , ghcOptExtra = hcOptions GHC bi <> cmmOptions bi
+    , ghcOptExtra = allGhcOptExtra bi <> hcOptions GHC bi <> cmmOptions bi
     , ghcOptObjDir = toFlag odir
     }
 

changelog.d/pr-10969.md

@@ -0,0 +1,7 @@
+---
+synopsis: Pass *-options to GHC when compiling ordinary Haskell sources
+packages: [Cabal, Cabal-syntax]
+prs: 10967
+---
+
+*-options should be always passed when invoking GHC, similarly as ghc-options should be always used when invoking ghc - regardless of what is the intention of a particular GHC-call. GHC might use or not use the options, Cabal cannot know and should not guess.