Add #if for GHC >=810

Author: zlonast

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

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE PatternSynonyms #-}
@@ -381,11 +382,14 @@ includePaths lbi bi clbi odir =
 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]
+    ++ ["-optl" ++ opt | opt <- ldOptions bi]
+    ++ ["-optc" ++ opt | opt <- ccOptions bi]
+#if __GLASGOW_HASKELL__ >= 810
+    -- Pass -optcxx for GHC >= 8.10 https://github.com/haskell/cabal/pull/7072
+    ++ ["-optcxx" ++ opt | opt <- cxxOptions bi]
+#endif
 
 componentCcGhcOptions
   :: Verbosity
@@ -423,7 +427,7 @@ componentCcGhcOptions verbosity lbi bi clbi odir filename =
           programPath
             <$> lookupProgram gccProgram (withPrograms lbi)
     , ghcOptObjDir = toFlag odir
-    , ghcOptExtra = allGhcOptExtra bi <> hcOptions GHC bi
+    , ghcOptExtra = hcOptions GHC bi
     }
 
 componentCxxGhcOptions
@@ -462,7 +466,7 @@ componentCxxGhcOptions verbosity lbi bi clbi odir filename =
           programPath
             <$> lookupProgram gccProgram (withPrograms lbi)
     , ghcOptObjDir = toFlag odir
-    , ghcOptExtra = allGhcOptExtra bi <> hcOptions GHC bi
+    , ghcOptExtra = hcOptions GHC bi
     }
 
 componentAsmGhcOptions
@@ -497,7 +501,7 @@ componentAsmGhcOptions verbosity lbi bi clbi odir filename =
              )
           ++ asmOptions bi
     , ghcOptObjDir = toFlag odir
-    , ghcOptExtra = allGhcOptExtra bi <> hcOptions GHC bi
+    , ghcOptExtra = hcOptions GHC bi
     }
 
 componentJsGhcOptions
@@ -521,7 +525,7 @@ componentJsGhcOptions verbosity lbi bi clbi odir filename =
     , ghcOptPackageDBs = withPackageDB lbi
     , ghcOptPackages = toNubListR $ mkGhcOptPackages (promisedPkgs lbi) clbi
     , ghcOptObjDir = toFlag odir
-    , ghcOptExtra = allGhcOptExtra bi <> hcOptions GHC bi
+    , ghcOptExtra = hcOptions GHC bi
     }
 
 componentGhcOptions
@@ -636,7 +640,7 @@ componentCmmGhcOptions verbosity lbi bi clbi odir filename =
     , ghcOptPackages = toNubListR $ mkGhcOptPackages (promisedPkgs lbi) clbi
     , ghcOptOptimisation = toGhcOptimisation (withOptimization lbi)
     , ghcOptDebugInfo = toFlag (withDebugInfo lbi)
-    , ghcOptExtra = allGhcOptExtra bi <> hcOptions GHC bi <> cmmOptions bi
+    , ghcOptExtra = hcOptions GHC bi <> cmmOptions bi
     , ghcOptObjDir = toFlag odir
     }
 

changelog.d/pr-10969.md

@@ -1,7 +1,7 @@
 ---
 synopsis: Pass *-options to GHC when compiling ordinary Haskell sources
-packages: [Cabal, Cabal-syntax]
-prs: 10967
+packages: [Cabal]
+prs: 10969
 ---
 
 *-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.