seprate build directories more and drop -inplace

Author: andreabedini

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

@@ -48,15 +48,16 @@ import Distribution.Simple.Compiler
   )
 import Distribution.System
 import Distribution.Types.ComponentName
-import Distribution.Types.LibraryName
+import Distribution.Client.Toolchain (Stage)
 
 -- | Information which can be used to construct the path to
 -- the build directory of a build.  This is LESS fine-grained
 -- than what goes into the hashed 'InstalledPackageId',
 -- and for good reason: we don't want this path to change if
 -- the user, say, adds a dependency to their project.
 data DistDirParams = DistDirParams
-  { distParamUnitId :: UnitId
+  { distParamStage :: Stage
+  , distParamUnitId :: UnitId
   , distParamPackageId :: PackageId
   , distParamComponentId :: ComponentId
   , distParamComponentName :: Maybe ComponentName
@@ -194,6 +195,7 @@ defaultDistDirLayout projectRoot mdistDirectory haddockOutputDir =
     distBuildDirectory :: DistDirParams -> FilePath
     distBuildDirectory params =
       distBuildRootDirectory
+        </> prettyShow (distParamStage params)
         </> prettyShow (distParamPlatform params)
         </> prettyShow (distParamCompilerId params)
         </> prettyShow (distParamUnitId params)

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

@@ -1924,8 +1924,6 @@ elaborateInstallPlan
                       BuildInplaceOnly{} ->
                         mkComponentId $
                           prettyShow pkgid
-                            ++ "-inplace-"
-                            ++ prettyShow (elabStage elab0)
                             ++ ( case Cabal.componentNameString cname of
                                   Nothing -> ""
                                   Just s -> "-" ++ prettyShow s
@@ -2154,7 +2152,7 @@ elaborateInstallPlan
 
             pkgInstalledId
               | shouldBuildInplaceOnly pkg =
-                  mkComponentId (prettyShow srcpkgPackageId ++ "-inplace-" ++ prettyShow solverPkgStage)
+                  mkComponentId (prettyShow srcpkgPackageId)
               | otherwise =
                   assert (isJust elabPkgSourceHash) $
                     hashedInstalledPackageId

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

@@ -651,7 +651,8 @@ elabConfiguredName verbosity elab
 elabDistDirParams :: ElaboratedSharedConfig -> ElaboratedConfiguredPackage -> DistDirParams
 elabDistDirParams shared elab =
   DistDirParams
-    { distParamUnitId = installedUnitId elab
+    { distParamStage = elabStage elab
+    , distParamUnitId = installedUnitId elab
     , distParamComponentId = elabComponentId elab
     , distParamPackageId = elabPkgSourceId elab
     , distParamComponentName = case elabPkgOrComp elab of

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

@@ -438,7 +438,8 @@ scriptExeFileName scriptPath = "cabal-script-" ++ takeFileName scriptPath
 scriptDistDirParams :: FilePath -> ProjectBaseContext -> Compiler -> Platform -> DistDirParams
 scriptDistDirParams scriptPath ctx compiler platform =
   DistDirParams
-    { distParamUnitId = newSimpleUnitId cid
+    { distParamStage = Host
+    , distParamUnitId = newSimpleUnitId cid
     , distParamPackageId = fakePackageId
     , distParamComponentId = cid
     , distParamComponentName = Just $ CExeName cn