s/Host/Build/g

Author: angerman

cabal-install/src/Distribution/Client/Config.hs

@@ -573,9 +573,9 @@ instance Semigroup SavedConfig where
               combineMonoid savedConfigureExFlags configAllowOlder
           , configWriteGhcEnvironmentFilesPolicy =
               combine configWriteGhcEnvironmentFilesPolicy
-          , configHostHcFlavor = combine configHostHcFlavor
-          , configHostHcPath = combine configHostHcPath
-          , configHostHcPkg = combine configHostHcPkg
+          , configBuildHcFlavor = combine configBuildHcFlavor
+          , configBuildHcPath = combine configBuildHcPath
+          , configBuildHcPkg = combine configBuildHcPkg
           }
         where
           combine = combine' savedConfigureExFlags

cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs

@@ -741,9 +741,9 @@ convertLegacyAllPackageFlags globalFlags configFlags configExFlags installFlags
       , configAllowNewer = projectConfigAllowNewer
       , configWriteGhcEnvironmentFilesPolicy =
         projectConfigWriteGhcEnvironmentFilesPolicy
-      , configHostHcFlavor = projectConfigHostHcFlavor
-      , configHostHcPath = projectConfigHostHcPath
-      , configHostHcPkg = projectConfigHostHcPkg
+      , configBuildHcFlavor = projectConfigBuildHcFlavor
+      , configBuildHcPath = projectConfigBuildHcPath
+      , configBuildHcPkg = projectConfigBuildHcPkg
       } = configExFlags
 
     InstallFlags

cabal-install/src/Distribution/Client/ProjectConfig/Types.hs

@@ -192,9 +192,9 @@ data ProjectConfigShared = ProjectConfigShared
   , projectConfigHcFlavor :: Flag CompilerFlavor
   , projectConfigHcPath :: Flag FilePath
   , projectConfigHcPkg :: Flag FilePath
-  , projectConfigHostHcFlavor :: Flag CompilerFlavor
-  , projectConfigHostHcPath :: Flag FilePath
-  , projectConfigHostHcPkg :: Flag FilePath
+  , projectConfigBuildHcFlavor :: Flag CompilerFlavor
+  , projectConfigBuildHcPath :: Flag FilePath
+  , projectConfigBuildHcPkg :: Flag FilePath
   , projectConfigHaddockIndex :: Flag PathTemplate
   , -- Only makes sense for manual mode, not --local mode
     -- too much control!

cabal-install/src/Distribution/Client/ProjectPlanning.hs

@@ -479,9 +479,9 @@ configureCompiler
         { projectConfigHcFlavor
         , projectConfigHcPath
         , projectConfigHcPkg
-        , projectConfigHostHcFlavor
-        , projectConfigHostHcPath
-        , projectConfigHostHcPkg
+        , projectConfigBuildHcFlavor
+        , projectConfigBuildHcPath
+        , projectConfigBuildHcPkg
         }
     , projectConfigLocalPackages =
       projectConfigLocalPackages@PackageConfig
@@ -512,9 +512,9 @@ configureCompiler
           (compiler, platform, progdb) <-
             liftIO $
               Cabal.configCompilerEx
-                hcFlavor
-                hcPath
-                hcPkg
+                buildHcFlavor
+                buildHcPath
+                buildHcPkg
                 defdb
                 verbosity
 
@@ -531,9 +531,9 @@ configureCompiler
           (compiler, platform, progdb) <-
             liftIO $
               Cabal.configCompilerEx
-                hostHcFlavor
-                hostHcPath
-                hostHcPkg
+                hcFlavor
+                hcPath
+                hcPkg
                 defdb
                 verbosity
 
@@ -551,9 +551,9 @@ configureCompiler
       hcFlavor = flagToMaybe projectConfigHcFlavor
       hcPath = flagToMaybe projectConfigHcPath
       hcPkg = flagToMaybe projectConfigHcPkg
-      hostHcFlavor = flagToMaybe projectConfigHostHcFlavor <|> flagToMaybe projectConfigHcFlavor
-      hostHcPath = flagToMaybe projectConfigHostHcPath <|> flagToMaybe projectConfigHcPath
-      hostHcPkg = flagToMaybe projectConfigHostHcPkg <|> flagToMaybe projectConfigHcPkg
+      buildHcFlavor = flagToMaybe projectConfigBuildHcFlavor <|> flagToMaybe projectConfigHcFlavor
+      buildHcPath = flagToMaybe projectConfigBuildHcPath <|> flagToMaybe projectConfigHcPath
+      buildHcPkg = flagToMaybe projectConfigBuildHcPkg <|> flagToMaybe projectConfigHcPkg
 
 {- Note [Caching the result of configuring the compiler]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

cabal-install/src/Distribution/Client/Setup.hs

@@ -920,9 +920,9 @@ data ConfigExFlags = ConfigExFlags
   , configAllowOlder :: Maybe AllowOlder
   , configWriteGhcEnvironmentFilesPolicy
       :: Flag WriteGhcEnvironmentFilesPolicy
-  , configHostHcFlavor :: Flag CompilerFlavor
-  , configHostHcPath :: Flag FilePath
-  , configHostHcPkg :: Flag FilePath
+  , configBuildHcFlavor :: Flag CompilerFlavor
+  , configBuildHcPath :: Flag FilePath
+  , configBuildHcPkg :: Flag FilePath
   }
   deriving (Eq, Show, Generic)
 
@@ -1054,8 +1054,8 @@ configureExOptions _showOrParseArgs src =
       []
       ["host-compiler"]
       "host compiler"
-      configHostHcFlavor
-      (\v flags -> flags{configHostHcFlavor = v})
+      configBuildHcFlavor
+      (\v flags -> flags{configBuildHcFlavor = v})
       ( choiceOpt
           [ (Flag GHC, ("g", ["ghc"]), "compile with GHC")
           , (Flag GHCJS, ([], ["ghcjs"]), "compile with GHCJS")
@@ -1065,15 +1065,15 @@ configureExOptions _showOrParseArgs src =
       "W"
       ["with-host-compiler", "with-host-hc"]
       "give the path to the compiler for the host toolchain"
-      configHostHcPath
-      (\v flags -> flags{configHostHcPath = v})
+      configBuildHcPath
+      (\v flags -> flags{configBuildHcPath = v})
       (reqArgFlag "PATH")
   , option
       ""
       ["with-host-hc-pkg"]
       "give the path to the package tool for the host toolchain"
-      configHostHcPkg
-      (\v flags -> flags{configHostHcPkg = v})
+      configBuildHcPkg
+      (\v flags -> flags{configBuildHcPkg = v})
       (reqArgFlag "PATH")
   ]