Re-revert: Revert haskell#3639 (Don't pass -package-db and -package f…

…lags to --abi-hash) (haskell#9384) for hadrian built with GHC 9.4 and Cabal HEAD to successfully build GHC.
mpickering · Apr 17, 2024 · e11de99 · e11de99
1 parent b216b99
commit e11de99
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/Cabal/src/Distribution/Simple/GHC.hs b/Cabal/src/Distribution/Simple/GHC.hs
@@ -720,12 +720,20 @@ libAbiHash verbosity _pkg_descr lbi lib clbi = do
     comp = compiler lbi
     platform = hostPlatform lbi
     mbWorkDir = mbWorkDirLBI lbi
-    vanillaArgs =
+    vanillaArgs0 =
       (Internal.componentGhcOptions verbosity lbi libBi clbi (componentBuildDir lbi clbi))
         `mappend` mempty
           { ghcOptMode = toFlag GhcModeAbiHash
           , ghcOptInputModules = toNubListR $ exposedModules lib
           }
+    vanillaArgs =
+      -- Package DBs unnecessary, and break ghc-cabal. See #3633
+      -- BUT, put at least the global database so that 7.4 doesn't
+      -- break.
+      vanillaArgs0
+        { ghcOptPackageDBs = [GlobalPackageDB]
+        , ghcOptPackages = mempty
+        }
     sharedArgs =
       vanillaArgs
         `mappend` mempty

diff --git a/Cabal/src/Distribution/Simple/GHCJS.hs b/Cabal/src/Distribution/Simple/GHCJS.hs
@@ -1768,12 +1768,20 @@ libAbiHash verbosity _pkg_descr lbi lib clbi = do
     comp = compiler lbi
     platform = hostPlatform lbi
     mbWorkDir = mbWorkDirLBI lbi
-    vanillaArgs =
+    vanillaArgs0 =
       (componentGhcOptions verbosity lbi libBi clbi (componentBuildDir lbi clbi))
         `mappend` mempty
           { ghcOptMode = toFlag GhcModeAbiHash
           , ghcOptInputModules = toNubListR $ exposedModules lib
           }
+    vanillaArgs =
+      -- Package DBs unnecessary, and break ghc-cabal. See #3633
+      -- BUT, put at least the global database so that 7.4 doesn't
+      -- break.
+      vanillaArgs0
+        { ghcOptPackageDBs = [GlobalPackageDB]
+        , ghcOptPackages = mempty
+        }
     sharedArgs =
       vanillaArgs
         `mappend` mempty