Merge pull request #7900 from sergv/add-test-for-cc-override

Update #7874: Add test, fix changelog

Author: mergify[bot]

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

@@ -301,7 +301,10 @@ componentCcGhcOptions verbosity _implInfo lbi bi clbi odir filename =
                                   NormalDebugInfo  -> ["-g"]
                                   MaximalDebugInfo -> ["-g3"]) ++
                                   ccOptions bi,
-      ghcOptObjDir         = toFlag odir
+      ghcOptCcProgram      = maybeToFlag $ programPath <$>
+                                 lookupProgram gccProgram (withPrograms lbi),
+      ghcOptObjDir         = toFlag odir,
+      ghcOptExtra          = hcOptions GHC bi
     }
 
 
@@ -337,7 +340,10 @@ componentCxxGhcOptions verbosity _implInfo lbi bi clbi odir filename =
                                   NormalDebugInfo  -> ["-g"]
                                   MaximalDebugInfo -> ["-g3"]) ++
                                   cxxOptions bi,
-      ghcOptObjDir         = toFlag odir
+      ghcOptCcProgram      = maybeToFlag $ programPath <$>
+                                 lookupProgram gccProgram (withPrograms lbi),
+      ghcOptObjDir         = toFlag odir,
+      ghcOptExtra          = hcOptions GHC bi
     }
 
 

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

@@ -446,6 +446,9 @@ data GhcOptions = GhcOptions {
   -- | Extra header files to include for old-style FFI; the @ghc -#include@ flag.
   ghcOptFfiIncludes    :: NubListR FilePath,
 
+  -- | Program to use for the C and C++ compiler; the @ghc -pgmc@ flag.
+  ghcOptCcProgram      :: Flag FilePath,
+
   ----------------------------
   -- Language and extensions
 
@@ -691,6 +694,7 @@ renderGhcOptions comp _platform@(Platform _arch os) opts
                 _ -> "-optc"
     in [ cxxflag ++ opt | opt <- ghcOptCxxOptions opts]
   , [ "-opta" ++ opt | opt <- ghcOptAsmOptions opts]
+  , concat [ ["-pgmc", cc] | cc <- flag ghcOptCcProgram ]
 
   -----------------
   -- Linker stuff

cabal-testsuite/PackageTests/CCompilerOverride/Main.hs

@@ -0,0 +1,13 @@
+{-# LANGUAGE ForeignFunctionInterface #-}
+
+module Main (main) where
+
+foreign import ccall "foo" foo :: Int -> Int
+
+main :: IO ()
+main = do
+  let x = foo 0
+      y = x
+  let x = y
+  print x
+  pure ()

cabal-testsuite/PackageTests/CCompilerOverride/custom-cc

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if which cc >/dev/null 2>&1; then
+    cc -DNOERROR6 "${@}"
+elif which gcc >/dev/null 2>&1; then
+    gcc -DNOERROR6 "${@}"
+elif which clang >/dev/null 2>&1; then
+    clang -DNOERROR6 "${@}"
+else
+    echo "Cannot find C compiler" >&2
+    exit 1
+fi
+

cabal-testsuite/PackageTests/CCompilerOverride/custom-cc.bat

@@ -0,0 +1,11 @@
+@echo OFF
+
+where /q gcc.exe
+
+IF %ERRORLEVEL% EQU 0 (
+   call gcc.exe -DNOERROR6 %*
+   EXIT /B %ERRORLEVEL%
+)
+
+ECHO "Cannot find C compiler"
+EXIT /B 1

cabal-testsuite/PackageTests/CCompilerOverride/foo.c

@@ -0,0 +1,28 @@
+
+#ifndef NOERROR1
+#error "NOERROR1 was not passed"
+#endif
+
+#ifndef NOERROR2
+#error "NOERROR2 was not passed"
+#endif
+
+#ifndef NOERROR3
+#error "NOERROR3 was not passed"
+#endif
+
+#ifndef NOERROR4
+#error "NOERROR4 was not passed"
+#endif
+
+#ifndef NOERROR5
+#error "NOERROR5 was not passed"
+#endif
+
+#ifndef NOERROR6
+#error "NOERROR6 was not passed"
+#endif
+
+int foo(int x) {
+    return x + 42;
+}

cabal-testsuite/PackageTests/CCompilerOverride/my.cabal

@@ -0,0 +1,13 @@
+name:           my
+version:        0.1
+license:        BSD3
+cabal-version:  >= 1.10
+build-type:     Simple
+
+executable foo
+    default-language: Haskell2010
+    main-is:          Main.hs
+    c-sources:        foo.c
+    build-depends:    base
+    ghc-options:      -DNOERROR4
+    cc-options:       -DNOERROR5 -march=native

cabal-testsuite/PackageTests/CCompilerOverride/setup.cabal.out

@@ -0,0 +1,4 @@
+# Setup configure
+Configuring my-0.1...
+Warning: Instead of 'ghc-options: -DNOERROR4' use 'cpp-options: -DNOERROR4'
+# Setup build

cabal-testsuite/PackageTests/CCompilerOverride/setup.out

@@ -0,0 +1,4 @@
+# Setup configure
+Configuring my-0.1...
+Warning: Instead of 'ghc-options: -DNOERROR4' use 'cpp-options: -DNOERROR4'
+# Setup build

cabal-testsuite/PackageTests/CCompilerOverride/setup.test.hs

@@ -0,0 +1,19 @@
+import Test.Cabal.Prelude
+
+-- Test that all the respective defines -DNOERROR... specified in variosu ways
+-- all end up routed to the C compiler. Otherwise the C file we depend on will
+-- not compile.
+main = setupAndCabalTest $ do
+  skipUnlessGhcVersion ">= 8.8"
+  isWin <- isWindows
+  env   <- getTestEnv
+  let pwd      = testCurrentDir env
+      customCC = pwd ++ "/custom-cc" ++ if isWin then ".bat" else ""
+
+  setup "configure"
+    [ "--ghc-option=-DNOERROR1"
+    , "--ghc-option=-optc=-DNOERROR2"
+    , "--ghc-option=-optP=-DNOERROR3"
+    , "--with-gcc=" ++ customCC
+    ]
+  setup "build" ["-v2"]