Check ghc supports -hiedir flag

Author: nlander

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

@@ -52,6 +52,8 @@ data GhcImplInfo = GhcImplInfo
   -- ^ use package-conf instead of package-db
   , flagDebugInfo :: Bool
   -- ^ -g flag supported
+  , flagHie :: Bool
+  -- ^ -hiedir flag supported
   , supportsDebugLevels :: Bool
   -- ^ supports numeric @-g@ levels
   , supportsPkgEnvFiles :: Bool
@@ -93,6 +95,7 @@ ghcVersionImplInfo ver =
     , flagProfLate = v >= [9, 4]
     , flagPackageConf = v < [7, 5]
     , flagDebugInfo = v >= [7, 10]
+    , flagHie = v >= [8, 8]
     , supportsDebugLevels = v >= [8, 0]
     , supportsPkgEnvFiles = v >= [8, 0, 1, 20160901] -- broken in 8.0.1, fixed in 8.0.2
     , flagWarnMissingHomeModules = v >= [8, 2]
@@ -118,6 +121,7 @@ ghcjsVersionImplInfo _ghcjsver ghcver =
     , flagProfLate = True
     , flagPackageConf = False
     , flagDebugInfo = False
+    , flagHie = False
     , supportsDebugLevels = ghcv >= [8, 0]
     , supportsPkgEnvFiles = ghcv >= [8, 0, 2] -- TODO: check this works in ghcjs
     , flagWarnMissingHomeModules = ghcv >= [8, 2]

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

@@ -82,6 +82,7 @@ import qualified Data.ByteString.Lazy.Char8 as BS
 import qualified Data.Map as Map
 import qualified Data.Set as Set
 import Distribution.Types.ComponentId (ComponentId)
+import Data.Bool (bool)
 import System.Directory (getDirectoryContents, getTemporaryDirectory)
 import System.Environment (getEnv)
 import System.FilePath
@@ -576,7 +577,7 @@ componentGhcOptions verbosity implInfo lbi bi clbi odir =
     , ghcOptFfiIncludes = toNubListR $ includes bi
     , ghcOptObjDir = toFlag odir
     , ghcOptHiDir = toFlag odir
-    , ghcOptHieDir = toFlag $ odir </> "extra-compilation-artifacts"
+    , ghcOptHieDir = toFlag $ bool Nothing (Just $ odir </> "extra-compilation-artifacts") $ flagHie implInfo
     , ghcOptStubDir = toFlag odir
     , ghcOptOutputDir = toFlag odir
     , ghcOptOptimisation = toGhcOptimisation (withOptimization lbi)

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

@@ -532,7 +532,7 @@ data GhcOptions = GhcOptions
   , ghcOptDynObjSuffix :: Flag String
   -- ^ only in 'GhcStaticAndDynamic' mode
   , ghcOptHiDir :: Flag FilePath
-  , ghcOptHieDir :: Flag FilePath
+  , ghcOptHieDir :: Flag (Maybe FilePath)
   , ghcOptObjDir :: Flag FilePath
   , ghcOptOutputDir :: Flag FilePath
   , ghcOptStubDir :: Flag FilePath
@@ -717,7 +717,7 @@ renderGhcOptions comp _platform@(Platform _arch os) opts
         , concat [["-outputdir", dir] | dir <- flag ghcOptOutputDir]
         , concat [["-odir", dir] | dir <- flag ghcOptObjDir]
         , concat [["-hidir", dir] | dir <- flag ghcOptHiDir]
-        , concat [["-hiedir", dir] | dir <- flag ghcOptHieDir]
+        , concat [ maybe [] (\dir -> ["-hiedir", dir]) mdir | mdir <- flag ghcOptHieDir]
         , concat [["-stubdir", dir] | dir <- flag ghcOptStubDir]
         , -----------------------
           -- Source search path

cabal-testsuite/PackageTests/CopyHie/cabal.test.hs

@@ -1,6 +1,7 @@
 import Test.Cabal.Prelude
 
 main = withShorterPathForNewBuildStore $ \storeDir -> cabalTest $ withRepo "repo" $ do
+  skipUnlessGhcVersion ">= 8.8"
   cabalG ["--store-dir=" ++ storeDir] "v2-build" ["hie"]
   liftIO $ do
     installedDependencyLibDir <- findDependencyInStore storeDir "hie-dependency"

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

@@ -1,6 +1,7 @@
 import Test.Cabal.Prelude
 
 main = setupAndCabalTest $ withPackageDb $ do
+  skipUnlessGhcVersion ">= 8.8"
   setup_install ["hie-local"]
   env <- getTestEnv
   shouldExist $ testLibInstallDir env </> "hie-local-0.1.0.0" </> "extra-compilation-artifacts" </> "HieLocal.hie"