Skip to content

Commit

Permalink
Revert #3639 (Don't pass -package-db and -package flags to --abi-hash)
Browse files Browse the repository at this point in the history
With ghc>=9.6 `ghc --abi-hash` initialises the plugins so it will fail
if a cabal file specifies `ghc-options: -fplugin=Foo`.
  • Loading branch information
andreabedini committed Oct 31, 2023
1 parent 1264967 commit accd7a6
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions Cabal/src/Distribution/Simple/GHCJS.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1739,20 +1739,12 @@ libAbiHash verbosity _pkg_descr lbi lib clbi = do
libBi = libBuildInfo lib
comp = compiler lbi
platform = hostPlatform lbi
vanillaArgs0 =
vanillaArgs =
(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
Expand Down

0 comments on commit accd7a6

Please sign in to comment.