ensureConfig

Author: snoyberg

src/Stack/Build/Cache.hs

@@ -25,13 +25,11 @@ import           Control.Monad.Logger (MonadLogger)
 import           Control.Monad.Reader
 import           Data.Binary (Binary)
 import qualified Data.Binary as Binary
-import           Data.ByteString (ByteString)
 import qualified Data.ByteString as S
 import qualified Data.ByteString.Lazy as L
 import           Data.Map (Map)
 import qualified Data.Map as Map
 import           Data.Maybe (catMaybes, mapMaybe)
-import           Data.Set (Set)
 import qualified Data.Set as Set
 import           GHC.Generics (Generic)
 import           Path
@@ -172,15 +170,10 @@ tryGetFlagCache gid = do
 
 writeFlagCache :: (MonadIO m, MonadReader env m, HasBuildConfig env, MonadThrow m)
                => Installed
-               -> [ByteString]
-               -> Set GhcPkgId
+               -> ConfigCache
                -> m ()
-writeFlagCache gid flags deps = do
+writeFlagCache gid cache = do
     file <- flagCacheFile gid
-    let cache = ConfigCache
-                              { configCacheOpts = flags
-                              , configCacheDeps = deps
-                              }
     liftIO $ do
         createDirectoryIfMissing True $ toFilePath $ parent file
 

src/Stack/Build/Execute.hs

@@ -280,15 +280,15 @@ toActions runInBase ee task@Task {..} =
         }
     ]
 
-singleBuild :: M env m
-            => ActionContext
-            -> ExecuteEnv
-            -> Task
-            -> m ()
-singleBuild ActionContext {..} ExecuteEnv {..} task@Task {..} =
-  withPackage $ \package cabalfp pkgDir ->
-  withLogFile package $ \mlogFile ->
-  withCabal pkgDir mlogFile $ \cabal -> do
+-- | Ensure that the configuration for the package matches what is given
+ensureConfig :: M env m
+             => Path Abs Dir -- ^ package directory
+             -> ExecuteEnv
+             -> Task
+             -> (Text -> m ()) -- ^ announce
+             -> (Bool -> [String] -> m ()) -- ^ cabal
+             -> m ConfigCache
+ensureConfig pkgDir ExecuteEnv {..} Task {..} announce cabal = do
     -- Determine the old and new configuration in the local directory, to
     -- determine if we need to reconfigure.
     mOldConfigCache <- tryGetConfigCache pkgDir
@@ -320,6 +320,19 @@ singleBuild ActionContext {..} ExecuteEnv {..} task@Task {..} =
         $logDebug $ T.pack $ show configOpts
         writeConfigCache pkgDir newConfigCache
 
+    return newConfigCache
+
+singleBuild :: M env m
+            => ActionContext
+            -> ExecuteEnv
+            -> Task
+            -> m ()
+singleBuild ActionContext {..} ee@ExecuteEnv {..} task@Task {..} =
+  withPackage $ \package cabalfp pkgDir ->
+  withLogFile package $ \mlogFile ->
+  withCabal pkgDir mlogFile $ \cabal -> do
+    cache <- ensureConfig pkgDir ee task announce cabal
+
     fileModTimes <- getPackageFileModTimes package cabalfp
     writeBuildCache pkgDir fileModTimes
 
@@ -353,10 +366,7 @@ singleBuild ActionContext {..} ExecuteEnv {..} task@Task {..} =
                 (packageVersion package)
         (True, Nothing) -> throwM $ Couldn'tFindPkgId $ packageName package
         (True, Just pkgid) -> return $ Library pkgid
-    writeFlagCache
-        mpkgid'
-        (map encodeUtf8 configOpts)
-        allDeps
+    writeFlagCache mpkgid' cache
     liftIO $ atomically $ modifyTVar eeGhcPkgIds $ Map.insert taskProvides mpkgid'
   where
     announce x = $logInfo $ T.concat