Merge pull request #9244 from nlander/make-hie-subdir

Put hie files in subdirectory of extra-compilation-artifacts
haskell · Sep 22, 2023 · bf6653e · bf6653e
2 parents b3b8228 + fd3dcc3
commit bf6653e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Cabal/src/Distribution/Simple/GHC/Internal.hs b/Cabal/src/Distribution/Simple/GHC/Internal.hs
@@ -578,7 +578,7 @@ componentGhcOptions verbosity implInfo lbi bi clbi odir =
     , ghcOptFfiIncludes = toNubListR $ includes bi
     , ghcOptObjDir = toFlag odir
     , ghcOptHiDir = toFlag odir
-    , ghcOptHieDir = bool NoFlag (toFlag $ odir </> extraCompilationArtifacts) $ flagHie implInfo
+    , ghcOptHieDir = bool NoFlag (toFlag $ odir </> extraCompilationArtifacts </> "hie") $ flagHie implInfo
     , ghcOptStubDir = toFlag odir
     , ghcOptOutputDir = toFlag odir
     , ghcOptOptimisation = toGhcOptimisation (withOptimization lbi)

diff --git a/cabal-testsuite/PackageTests/CopyHie/cabal.test.hs b/cabal-testsuite/PackageTests/CopyHie/cabal.test.hs
@@ -5,4 +5,4 @@ main = withShorterPathForNewBuildStore $ \storeDir -> cabalTest $ withRepo "repo
   cabalG ["--store-dir=" ++ storeDir] "v2-build" ["hie"]
   liftIO $ do
     installedDependencyLibDir <- findDependencyInStore storeDir "hie-dependency"
-    shouldExist $ installedDependencyLibDir </> "lib" </> "extra-compilation-artifacts" </> "HieDependency.hie"
+    shouldExist $ installedDependencyLibDir </> "lib" </> "extra-compilation-artifacts" </> "hie" </> "HieDependency.hie"
diff --git a/cabal-testsuite/PackageTests/CopyHie/setup.test.hs b/cabal-testsuite/PackageTests/CopyHie/setup.test.hs
@@ -4,4 +4,4 @@ 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"
+  shouldExist $ testLibInstallDir env </> "hie-local-0.1.0.0" </> "extra-compilation-artifacts" </> "hie" </> "HieLocal.hie"