cpp-options only for hs

Author: zlonast

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

@@ -356,8 +356,8 @@ splitCandCxxOptions
   -> LocalBuildInfo
   -> BuildInfo
   -> ComponentLocalBuildInfo
-  -> SymbolicPathX 'AllowAbsolute Pkg (Dir Artifacts)
-  -> SymbolicPathX 'AllowAbsolute Pkg File
+  -> SymbolicPath Pkg (Dir Artifacts)
+  -> SymbolicPath Pkg File
   -> GhcOptions
 splitCandCxxOptions source verbosity lbi bi clbi odir filename = case source of
   CxxProgram ->
@@ -453,6 +453,9 @@ sourcesGhcOptions verbosity lbi bi clbi odir filename =
     , ghcOptInputFiles = toNubListR [filename]
     , ghcOptObjDir = toFlag odir
     , ghcOptPackages = toNubListR $ mkGhcOptPackages (promisedPkgs lbi) clbi
+    , -- cpp-options apply only to .hs files; GHC ignores -optP for non-Haskell
+      -- files (and since 9.10 this behavior is explicit/enforced)
+      ghcOptCppOptions = []
     }
 
 optimizationCFlags :: LocalBuildInfo -> [String]

changelog.d/11997.md

@@ -0,0 +1,9 @@
+---
+synopsis: cpp-options apply only to .hs files
+packages: [Cabal]
+prs: 11997
+issues: 11992
+---
+
+cpp-options apply only to .hs files; GHC ignores -optP for non-Haskell
+files (and since 9.10 this behavior is explicit/enforced)