Skip to content

Commit 22d443e

Browse files
committed
Revert #3639 (Don't pass -package-db and -package flags to --abi-hash)
With ghc>=9.6 `ghc --abi-hash` initialises the plugins so it will fail if a cabal file specifies `ghc-options: -fplugin=Foo`. Closes: #9375
1 parent 1264967 commit 22d443e

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

Cabal/src/Distribution/Simple/GHCJS.hs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1739,20 +1739,12 @@ libAbiHash verbosity _pkg_descr lbi lib clbi = do
17391739
libBi = libBuildInfo lib
17401740
comp = compiler lbi
17411741
platform = hostPlatform lbi
1742-
vanillaArgs0 =
1742+
vanillaArgs =
17431743
(componentGhcOptions verbosity lbi libBi clbi (componentBuildDir lbi clbi))
17441744
`mappend` mempty
17451745
{ ghcOptMode = toFlag GhcModeAbiHash
17461746
, ghcOptInputModules = toNubListR $ exposedModules lib
17471747
}
1748-
vanillaArgs =
1749-
-- Package DBs unnecessary, and break ghc-cabal. See #3633
1750-
-- BUT, put at least the global database so that 7.4 doesn't
1751-
-- break.
1752-
vanillaArgs0
1753-
{ ghcOptPackageDBs = [GlobalPackageDB]
1754-
, ghcOptPackages = mempty
1755-
}
17561748
sharedArgs =
17571749
vanillaArgs
17581750
`mappend` mempty

0 commit comments

Comments
 (0)