From 76e5af817af41a4903957fc3a768f0eb2f19ad55 Mon Sep 17 00:00:00 2001 From: Daniel Vigovszky Date: Tue, 19 May 2015 15:25:22 +0200 Subject: [PATCH] Not passing package db flags in default case --- Language/Haskell/GhcMod/CabalHelper.hs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Language/Haskell/GhcMod/CabalHelper.hs b/Language/Haskell/GhcMod/CabalHelper.hs index 1ea7a55..42bb744 100644 --- a/Language/Haskell/GhcMod/CabalHelper.hs +++ b/Language/Haskell/GhcMod/CabalHelper.hs @@ -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]