Move getDefaultPackageConfig to where it is used

commercialhaskell · Aug 17, 2017 · f73b34a · f73b34a
1 parent ea5646f
commit f73b34a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/src/Stack/Build/Source.hs b/src/Stack/Build/Source.hs
@@ -13,7 +13,6 @@ module Stack.Build.Source
     , getLocalFlags
     , getGhcOptions
     , addUnlistedToBuildCache
-    , getDefaultPackageConfig
     ) where
 
 import              Stack.Prelude
@@ -471,20 +470,6 @@ checkComponentsBuildable lps =
         , c <- Set.toList (lpUnbuildable lp)
         ]
 
-getDefaultPackageConfig :: (MonadIO m, MonadReader env m, HasEnvConfig env)
-  => m PackageConfig
-getDefaultPackageConfig = do
-  platform <- view platformL
-  compilerVersion <- view actualCompilerVersionL
-  return PackageConfig
-    { packageConfigEnableTests = False
-    , packageConfigEnableBenchmarks = False
-    , packageConfigFlags = M.empty
-    , packageConfigGhcOptions = []
-    , packageConfigCompilerVersion = compilerVersion
-    , packageConfigPlatform = platform
-    }
-
 -- | Get 'PackageConfig' for package given its name.
 getPackageConfig :: (MonadIO m, MonadReader env m, HasEnvConfig env)
   => BuildOptsCLI

diff --git a/src/Stack/SDist.hs b/src/Stack/SDist.hs
@@ -51,7 +51,7 @@ import           Path.IO hiding (getModificationTime, getPermissions, withSystem
 import           Stack.Build (mkBaseConfigOpts, build)
 import           Stack.Build.Execute
 import           Stack.Build.Installed
-import           Stack.Build.Source (loadSourceMap, getDefaultPackageConfig)
+import           Stack.Build.Source (loadSourceMap)
 import           Stack.Build.Target hiding (PackageType (..))
 import           Stack.PackageLocation (resolveMultiPackageLocation)
 import           Stack.Constants
@@ -443,3 +443,17 @@ getModTime :: FilePath -> IO Tar.EpochTime
 getModTime path = do
     t <- getModificationTime path
     return . floor . utcTimeToPOSIXSeconds $ t
+
+getDefaultPackageConfig :: (MonadIO m, MonadReader env m, HasEnvConfig env)
+  => m PackageConfig
+getDefaultPackageConfig = do
+  platform <- view platformL
+  compilerVersion <- view actualCompilerVersionL
+  return PackageConfig
+    { packageConfigEnableTests = False
+    , packageConfigEnableBenchmarks = False
+    , packageConfigFlags = mempty
+    , packageConfigGhcOptions = []
+    , packageConfigCompilerVersion = compilerVersion
+    , packageConfigPlatform = platform
+    }