--coverage enables -fhpc despite apply-ghc-options

commercialhaskell · Nov 24, 2015 · fb92cd4 · fb92cd4
1 parent d38f5ae
commit fb92cd4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/src/Stack/Options.hs b/src/Stack/Options.hs
@@ -74,17 +74,10 @@ benchOptsParser = BenchmarkOpts
         <*> switch (long "no-run-benchmarks" <>
                    help "Disable running of benchmarks. (Benchmarks will still be built.)")
 
-addCoverageFlags :: BuildOpts -> BuildOpts
-addCoverageFlags bopts
-    | toCoverage $ boptsTestOpts bopts
-        = bopts { boptsGhcOptions = "-fhpc" : boptsGhcOptions bopts }
-    | otherwise = bopts
-
 -- | Parser for build arguments.
 buildOptsParser :: Command
                 -> Parser BuildOpts
 buildOptsParser cmd =
-            fmap addCoverageFlags $
             BuildOpts <$> target <*> libProfiling <*> exeProfiling <*>
             haddock <*> haddockDeps <*> dryRun <*> ghcOpts <*>
             flags <*> copyBins <*> preFetch <*> buildSubset <*>

diff --git a/src/Stack/Types/Build.hs b/src/Stack/Types/Build.hs
@@ -727,6 +727,7 @@ configureOptsNoDir econfig bco deps wanted isLocal package = concat
     allGhcOptions = concat
         [ Map.findWithDefault [] Nothing (configGhcOptions config)
         , Map.findWithDefault [] (Just $ packageName package) (configGhcOptions config)
+        , concat [["-fhpc", "-fforce-recomp"] | isLocal && toCoverage (boptsTestOpts bopts)]
         , if includeExtraOptions
             then boptsGhcOptions bopts
             else []