Skip to content
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

Jump to bottom

Don't pass -package-db and -package flags to --abi-hash. #3639

Merged
merged 2 commits into from
Aug 4, 2016
Merged

Don't pass -package-db and -package flags to --abi-hash. #3639

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
562eaa3
Don't pass -package-db and -package flags to --abi-hash.
ezyang Jul 28, 2016
ec6a1dd
Adjust to handle GHC 7.4.
ezyang Jul 28, 2016
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
8 changes: 7 additions & 1 deletion Cabal/Distribution/Simple/GHC.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,12 +1048,18 @@ libAbiHash verbosity _pkg_descr lbi lib clbi = do
let
comp = compiler lbi
platform = hostPlatform 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 {
ghcOptDynLinkMode = toFlag GhcDynamicOnly,
ghcOptFPic = toFlag True,
Expand Down