Not passing package db flags in default case

This commit is contained in:
Daniel Vigovszky 2015-05-19 15:25:22 +02:00
parent 0bb1671238
commit 76e5af817a
1 changed files with 7 additions and 1 deletions

View File

@ -101,7 +101,10 @@ withCabal action = do
opts <- options
liftIO $ whenM (isSetupConfigOutOfDate <$> getCurrentWorld crdl) $
withDirectory_ (cradleRootDir crdl) $ do
let pkgDbArgs = "--package-db=clear" : map pkgDbArg (cradlePkgDbStack crdl)
let pkgDbStack = cradlePkgDbStack crdl
pkgDbArgs = if pkgDbStack == defaultPkgDbStack
then []
else "--package-db=clear" : map pkgDbArg pkgDbStack
progOpts =
[ "--with-ghc=" ++ T.ghcProgram opts ]
-- Only pass ghc-pkg if it was actually set otherwise we
@ -118,3 +121,6 @@ pkgDbArg :: GhcPkgDb -> String
pkgDbArg GlobalDb = "--package-db=global"
pkgDbArg UserDb = "--package-db=user"
pkgDbArg (PackageDb p) = "--package-db=" ++ p
defaultPkgDbStack :: [GhcPkgDb]
defaultPkgDbStack = [GlobalDb, UserDb]