s/projectConfigHostHc/projectConfigBuildHc

Author: andreabedini

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

@@ -117,6 +117,7 @@ import Distribution.Backpack.FullUnitId
 import Distribution.Backpack.LinkedComponent
 import Distribution.Backpack.ModuleShape
 import Distribution.CabalSpecVersion
+
 -- import qualified Distribution.Client.BuildReports.Storage as BuildReports
 import Distribution.Client.Compat.Prelude
 import Distribution.Client.Config
@@ -362,7 +363,13 @@ rebuildProjectConfig
     , distProjectCacheDirectory
     , distProjectFile
     }
-  cliConfig = do
+  cliConfig@ProjectConfig
+    { projectConfigShared =
+      ProjectConfigShared
+        { projectConfigIgnoreProject
+        , projectConfigConfigFile
+        }
+    } = do
     progsearchpath <- liftIO $ getSystemSearchPath
 
     let fileMonitorProjectConfig = newFileMonitor (distProjectCacheFile "config")
@@ -372,7 +379,7 @@ rebuildProjectConfig
       return
         ( configPath
         , distProjectFile ""
-        , (projectConfigHcFlavor, projectConfigHcPath, projectConfigHcPkg)
+        , toolchainCacheKey
         , progsearchpath
         , packageConfigProgramPaths
         , packageConfigProgramPathExtra
@@ -392,12 +399,9 @@ rebuildProjectConfig
                 -- have to create the cache directory before configuring the compiler
                 liftIO $ createDirectoryIfMissingVerbose verbosity True distProjectCacheDirectory
                 toolchains <- configureCompiler verbosity distDirLayout (fst (PD.ignoreConditions projectConfigSkeleton) <> cliConfig)
-                -- FIXME: what compiler to use here?
-                let Toolchain
-                      { toolchainCompiler = compiler
-                      , toolchainPlatform = Platform arch os
-                      } = getStage toolchains Host
-                return (os, arch, compiler)
+                -- NOTE: project config is always resolved with the host compiler
+                let Toolchain{toolchainCompiler, toolchainPlatform = Platform arch os} = getStage toolchains Host
+                return (os, arch, toolchainCompiler)
 
           (projectConfig, _compiler) <- instantiateProjectConfigSkeletonFetchingCompiler fetchCompiler mempty projectConfigSkeleton
           when (projectConfigDistDir (projectConfigShared $ projectConfig) /= NoFlag) $
@@ -410,6 +414,7 @@ rebuildProjectConfig
           [ text "-" <+> docProjectConfigPath path
           | Explicit path <- Set.toList . (if verbosity >= verbose then id else onlyTopLevelProvenance) $ projectConfigProvenance projectConfig
           ]
+
     unless (null configfiles)
       $ notice (verboseStderr verbosity)
         . render
@@ -419,8 +424,14 @@ rebuildProjectConfig
 
     return (projectConfig <> cliConfig, localPackages)
     where
-      ProjectConfigShared{projectConfigHcFlavor, projectConfigHcPath, projectConfigHcPkg, projectConfigIgnoreProject, projectConfigConfigFile} =
-        projectConfigShared cliConfig
+      toolchainCacheKey =
+        ( projectConfigBuildHcFlavor (projectConfigShared cliConfig)
+        , projectConfigBuildHcPath (projectConfigShared cliConfig)
+        , projectConfigBuildHcPkg (projectConfigShared cliConfig)
+        , projectConfigHcFlavor (projectConfigShared cliConfig)
+        , projectConfigHcPath (projectConfigShared cliConfig)
+        , projectConfigHcPkg (projectConfigShared cliConfig)
+        )
 
       PackageConfig{packageConfigProgramPaths, packageConfigProgramPathExtra} =
         projectConfigLocalPackages cliConfig
@@ -475,9 +486,9 @@ configureCompiler
         { projectConfigHcFlavor
         , projectConfigHcPath
         , projectConfigHcPkg
-        , projectConfigHostHcFlavor
-        , projectConfigHostHcPath
-        , projectConfigHostHcPkg
+        , projectConfigBuildHcFlavor
+        , projectConfigBuildHcPath
+        , projectConfigBuildHcPkg
         }
     , projectConfigLocalPackages =
       projectConfigLocalPackages@PackageConfig
@@ -492,9 +503,7 @@ configureCompiler
     rerunIfChanged
       verbosity
       fileMonitorCompiler
-      ( hcFlavor
-      , hcPath
-      , hcPkg
+      ( cacheKey
       , progsearchpath
       , packageConfigProgramPaths
       , packageConfigProgramPathExtra
@@ -506,13 +515,7 @@ configureCompiler
 
         buildToolchain <- do
           (toolchainCompiler, toolchainPlatform, toolchainProgramDb) <-
-            liftIO $
-              Cabal.configCompilerEx
-                hcFlavor
-                hcPath
-                hcPkg
-                defdb
-                verbosity
+            liftIO $ Cabal.configCompilerEx buildHcFlavor buildHcPath buildHcPkg defdb verbosity
 
           -- Note that we added the user-supplied program locations and args
           -- for /all/ programs, not just those for the compiler prog and
@@ -525,13 +528,7 @@ configureCompiler
 
         hostToolchain <- do
           (toolchainCompiler, toolchainPlatform, toolchainProgramDb) <-
-            liftIO $
-              Cabal.configCompilerEx
-                hostHcFlavor
-                hostHcPath
-                hostHcPkg
-                defdb
-                verbosity
+            liftIO $ Cabal.configCompilerEx hostHcFlavor hostHcPath hostHcPkg defdb verbosity
 
           -- Note that we added the user-supplied program locations and args
           -- for /all/ programs, not just those for the compiler prog and
@@ -544,12 +541,15 @@ configureCompiler
 
         return (Stage.index [(Build, buildToolchain), (Host, hostToolchain)])
     where
-      hcFlavor = flagToMaybe projectConfigHcFlavor
-      hcPath = flagToMaybe projectConfigHcPath
-      hcPkg = flagToMaybe projectConfigHcPkg
-      hostHcFlavor = flagToMaybe projectConfigHostHcFlavor <|> flagToMaybe projectConfigHcFlavor
-      hostHcPath = flagToMaybe projectConfigHostHcPath <|> flagToMaybe projectConfigHcPath
-      hostHcPkg = flagToMaybe projectConfigHostHcPkg <|> flagToMaybe projectConfigHcPkg
+      hostHcFlavor = flagToMaybe projectConfigHcFlavor
+      hostHcPath = flagToMaybe projectConfigHcPath
+      hostHcPkg = flagToMaybe projectConfigHcPkg
+      -- Use the host compiler if a separate build compiler is not specified
+      buildHcFlavor = flagToMaybe projectConfigBuildHcFlavor <|> flagToMaybe projectConfigHcFlavor
+      buildHcPath = flagToMaybe projectConfigBuildHcPath <|> flagToMaybe projectConfigHcPath
+      buildHcPkg = flagToMaybe projectConfigBuildHcPkg <|> flagToMaybe projectConfigHcPkg
+
+      cacheKey = (hostHcFlavor, hostHcPath, hostHcPkg, buildHcFlavor, buildHcPath, buildHcPkg)
 
 {- Note [Caching the result of configuring the compiler]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -682,7 +682,7 @@ rebuildInstallPlan
                 phaseMaintainPlanOutputs elaboratedPlan elaboratedShared
                 return (elaboratedPlan, elaboratedShared, totalIndexState, activeRepos)
 
-          -- | Given the 'InstalledPackageIndex' for a nix-style package store, and an
+          -- \| Given the 'InstalledPackageIndex' for a nix-style package store, and an
           -- 'ElaboratedInstallPlan', replace configured source packages by installed
           -- packages from the store whenever they exist.
           --

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)
 
@@ -1050,30 +1050,19 @@ configureExOptions _showOrParseArgs src =
           writeGhcEnvironmentFilesPolicyParser
           writeGhcEnvironmentFilesPolicyPrinter
       )
-  , option
-      []
-      ["host-compiler"]
-      "host compiler"
-      configHostHcFlavor
-      (\v flags -> flags{configHostHcFlavor = v})
-      ( choiceOpt
-          [ (Flag GHC, ("g", ["ghc"]), "compile with GHC")
-          , (Flag GHCJS, ([], ["ghcjs"]), "compile with GHCJS")
-          ]
-      )
   , option
       "W"
-      ["with-host-compiler", "with-host-hc"]
+      ["with-build-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})
+      ["with-build-hc-pkg"]
+      "give the path to the package tool for the build toolchain"
+      configBuildHcPkg
+      (\v flags -> flags{configBuildHcPkg = v})
       (reqArgFlag "PATH")
   ]
 

cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs

@@ -613,9 +613,9 @@ instance Arbitrary ProjectConfigShared where
     projectConfigHcFlavor <- arbitrary
     projectConfigHcPath <- arbitraryFlag arbitraryShortToken
     projectConfigHcPkg <- arbitraryFlag arbitraryShortToken
-    projectConfigHostHcFlavor <- arbitrary
-    projectConfigHostHcPath <- arbitraryFlag arbitraryShortToken
-    projectConfigHostHcPkg <- arbitraryFlag arbitraryShortToken
+    projectConfigBuildHcFlavor <- arbitrary
+    projectConfigBuildHcPath <- arbitraryFlag arbitraryShortToken
+    projectConfigBuildHcPkg <- arbitraryFlag arbitraryShortToken
     projectConfigHaddockIndex <- arbitrary
     projectConfigInstallDirs <- fixInstallDirs <$> arbitrary
     projectConfigPackageDBs <- shortListOf 2 arbitrary
@@ -663,9 +663,9 @@ instance Arbitrary ProjectConfigShared where
         <*> shrinker projectConfigHcFlavor
         <*> shrinkerAla (fmap NonEmpty) projectConfigHcPath
         <*> shrinkerAla (fmap NonEmpty) projectConfigHcPkg
-        <*> shrinker projectConfigHostHcFlavor
-        <*> shrinkerAla (fmap NonEmpty) projectConfigHostHcPath
-        <*> shrinkerAla (fmap NonEmpty) projectConfigHostHcPkg
+        <*> shrinker projectConfigBuildHcFlavor
+        <*> shrinkerAla (fmap NonEmpty) projectConfigBuildHcPath
+        <*> shrinkerAla (fmap NonEmpty) projectConfigBuildHcPkg
         <*> shrinker projectConfigHaddockIndex
         <*> shrinker projectConfigInstallDirs
         <*> shrinker projectConfigPackageDBs