Skip to content

Revert #3639 (Don't pass -package-db and -package flags to --abi-hash) #9384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 4 commits into from
Nov 4, 2023
+2 −18
Merged

Revert #3639 (Don't pass -package-db and -package flags to --abi-hash) #9384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22d443e
Revert #3639 (Don't pass -package-db and -package flags to --abi-hash)
andreabedini Oct 31, 2023
c362ba5
Also revert in GHC.hs
hamishmack Nov 1, 2023
08959e6
Merge branch 'master' into andrea/revert-ghc-cabal-workaround
andreabedini Nov 2, 2023
f28cf9c
Merge branch 'master' into andrea/revert-ghc-cabal-workaround
mergify[bot] Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions Cabal/src/Distribution/Simple/GHC.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2052,20 +2052,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
10 changes: 1 addition & 9 deletions Cabal/src/Distribution/Simple/GHCJS.hs
View file
Open in desktop
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