aboutsummaryrefslogtreecommitdiff
path: root/CabalHelper
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2015-08-19 06:47:33 +0200
committerDaniel Gröber <dxld@darkboxed.org>2015-08-19 06:47:33 +0200
commit2cfd8be6353deccf65aa53f2cb7d812a80fc4493 (patch)
tree14cd062f0376321860f55eb5475eef5e69d1e885 /CabalHelper
parentfd9de40c61a9f6fac1b4e961e824d1bbb8d16555 (diff)
Cleanup some occurrences duplicate flags
Diffstat (limited to 'CabalHelper')
-rw-r--r--CabalHelper/Main.hs25
1 files changed, 11 insertions, 14 deletions
diff --git a/CabalHelper/Main.hs b/CabalHelper/Main.hs
index 290584d..5f5690b 100644
--- a/CabalHelper/Main.hs
+++ b/CabalHelper/Main.hs
@@ -168,15 +168,7 @@ main = do
return $ Just $ ChResponseVersion (show comp) ver
"ghc-options":flags -> do
- res <- componentsMap lbi v distdir $ \c clbi bi -> let
- outdir = componentOutDir lbi c
- (clbi', adopts) = case flags of
- ["--with-inplace"] -> (clbi, mempty)
- [] -> removeInplaceDeps v lbi pd clbi
-
-
- opts = componentGhcOptions normal lbi bi clbi' outdir
- in renderGhcOptions' lbi v (opts `mappend` adopts)
+ res <- componentOptions lvd True flags id
return $ Just $ ChResponseCompList (res ++ [(ChSetupHsName, [])])
"ghc-src-options":flags -> do
@@ -204,12 +196,15 @@ main = do
"ghc-merged-pkg-options":flags -> do
let pd = localPkgDescr lbi
res <- mconcat . map snd <$> (componentOptions' lvd True flags (\_ _ o -> return o) $ \opts -> mempty {
- ghcOptPackageDBs = ghcOptPackageDBs opts,
- ghcOptPackages = ghcOptPackages opts,
- ghcOptHideAllPackages = ghcOptHideAllPackages opts
+ ghcOptPackageDBs = [],
+ ghcOptHideAllPackages = NoFlag,
+ ghcOptPackages = ghcOptPackages opts
})
- let res' = res { ghcOptPackageDBs = nub $ ghcOptPackageDBs res }
+ let res' = res { ghcOptPackageDBs = withPackageDB lbi
+ , ghcOptHideAllPackages = Flag True
+ , ghcOptPackages = nub $ ghcOptPackages res
+ }
Just . ChResponseList <$> renderGhcOptions' lbi v res'
@@ -304,7 +299,7 @@ componentOptions' (lbi, v, distdir) inplaceFlag flags rf f = do
opts = componentGhcOptions normal lbi bi clbi' outdir
opts' = f opts
- in rf lbi v $ opts' `mappend` adopts
+ in rf lbi v $ nubPackageFlags $ opts' `mappend` adopts
componentOptions (lbi, v, distdir) inplaceFlag flags f =
componentOptions' (lbi, v, distdir) inplaceFlag flags renderGhcOptions' f
@@ -380,6 +375,8 @@ removeInplaceDeps v lbi pd clbi = let
isInplaceDep :: (InstalledPackageId, PackageId) -> Bool
isInplaceDep (ipid, pid) = inplacePackageId pid == ipid
+nubPackageFlags opts = opts { ghcOptPackages = nub $ ghcOptPackages opts }
+
renderGhcOptions' lbi v opts = do
#if CABAL_MAJOR == 1 && CABAL_MINOR < 20
(ghcProg, _) <- requireProgram v ghcProgram (withPrograms lbi)