Add allGhcOptExtra from all *-options

Add test for capi

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 #-}
@@ -377,6 +378,18 @@ includePaths lbi bi clbi odir =
          | dir <- mapMaybe (symbolicPathRelative_maybe . unsafeCoerceSymbolicPath) $ includeDirs bi
          ]
 
+allGhcOptExtra :: BuildInfo -> [String]
+allGhcOptExtra bi =
+  ["-optP" ++ opt | opt <- cppOptions bi]
+    ++ ["-opta" ++ opt | opt <- asmOptions 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
   -> LocalBuildInfo
@@ -581,7 +594,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

cabal-testsuite/PackageTests/FFI/ForeignOptsCapi/Main.hs

@@ -0,0 +1,15 @@
+{-# LANGUAGE CApiFFI #-}
+
+module Main where
+
+import Foreign.C (CInt (..))
+
+foreign import capi "clib.h myplus"
+  myplus :: CInt -> CInt -> IO CInt
+
+main :: IO ()
+main = do
+    result <- myplus 5 6
+    if (result == 11)
+        then putStrLn ("The result is " ++ show result)
+        else error ("Expected value 11, got " ++ show result)

cabal-testsuite/PackageTests/FFI/ForeignOptsCapi/README.md

@@ -0,0 +1,3 @@
+# ForeignOptsCapi
+
+This test case asserts that cabal passes `cc-options` to the C compiler when use `foreign import capi`.

cabal-testsuite/PackageTests/FFI/ForeignOptsCapi/cabal.out

@@ -0,0 +1,12 @@
+# cabal v2-build
+Configuration is affected by the following files:
+- cabal.project
+Resolving dependencies...
+Build profile: -w ghc-<GHCVER> -O1
+In order, the following will be built:
+ - foreign-opts-capi-0.1 (exe:foreign-opts-capi-exe) (first run)
+Configuring executable 'foreign-opts-capi-exe' for foreign-opts-capi-0.1...
+Preprocessing executable 'foreign-opts-capi-exe' for foreign-opts-capi-0.1...
+Building executable 'foreign-opts-capi-exe' for foreign-opts-capi-0.1...
+# foreign-opts-capi foreign-opts-capi-exe
+The result is 11

cabal-testsuite/PackageTests/FFI/ForeignOptsCapi/cabal.project

@@ -0,0 +1 @@
+packages: .

cabal-testsuite/PackageTests/FFI/ForeignOptsCapi/cabal.test.hs

@@ -0,0 +1,4 @@
+import Test.Cabal.Prelude
+main = cabalTest $ do
+    cabal "v2-build" ["foreign-opts-capi-exe"]
+    withPlan $ runPlanExe "foreign-opts-capi" "foreign-opts-capi-exe" []

cabal-testsuite/PackageTests/FFI/ForeignOptsCapi/cbits/clib.c

@@ -0,0 +1,7 @@
+#ifndef MYDEF
+#error "Did not get required MYDEF from cc-options"
+#endif
+
+static inline int myplus(int a, int b) {
+    return a + b;
+}

cabal-testsuite/PackageTests/FFI/ForeignOptsCapi/cbits/clib.h

@@ -0,0 +1,11 @@
+cabal-version:       3.0
+name:                foreign-opts-capi
+version:             0.1
+build-type:          Simple
+
+executable foreign-opts-capi-exe
+  main-is:             Main.hs
+  build-depends:       base
+  default-language:    Haskell2010
+  include-dirs:        cbits
+  cc-options:          -DMYDEF=1

cabal-testsuite/PackageTests/FFI/ForeignOptsCapi/foreign-opts-capi.cabal

@@ -0,0 +1,10 @@
+---
+synopsis: Pass *-options to GHC when compiling ordinary Haskell sources
+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.