fixup! Lock Configure per build

Author: angerman

Cabal/src/Distribution/Simple/ConfigureScript.hs

@@ -52,7 +52,6 @@ import qualified Data.Map as Map
 import Control.Concurrent.MVar
 import Data.IORef
 import System.IO.Unsafe (unsafePerformIO)
---- BEGIN MODIFICATION: Locking Mechanism ---
 
 -- Global state for locks, one MVar per build directory path.
 -- The MVar () acts as a mutex: it's full when the lock is available (unlocked),
@@ -72,7 +71,6 @@ getOrCreateLock path = do
         case Map.lookup path currentMap of
             Just existingLock -> (currentMap, existingLock) -- Lock already exists, return it. The newLock we created is discarded.
             Nothing           -> (Map.insert path newLock currentMap, newLock) -- New lock inserted, return it.
---- END MODIFICATION: Locking Mechanism ---
 
 runConfigureScript
   :: ConfigFlags
@@ -205,10 +203,9 @@ runConfigureScript cfg flags programDb hp = do
     lookupProgram shProg
       `fmap` configureProgram verbosity shProg progDb
 
-  --- BEGIN MODIFICATION: Apply Locking ---
   -- Acquire the lock specific to this build_dir
   -- build_dir is used as the key for the lock.
-  configureLock <- getOrCreateLock (interpretSymbolicPath mbWorkDir build_dir)
+  configureLock <- getOrCreateLock configureFile'
 
   let runLockedConfigureAction = do
         case shConfiguredProg of
@@ -222,14 +219,14 @@ runConfigureScript cfg flags programDb hp = do
                 }
           Nothing -> dieWithException verbosity NotFoundMsg
 
-  warn verbosity $ "Attempting to acquire configure lock for " ++ interpretSymbolicPath mbWorkDir build_dir
+  warn verbosity $ "Attempting to acquire configure lock for " ++ configureFile'
   -- withMVar takes the MVar (blocks if already taken), runs the action,
   -- and ensures the MVar is put back, even if the action throws an exception.
   withMVar configureLock $ \() ->
     -- The '()' means the MVar holds a unit value; we're interested in its full/empty state.
     runLockedConfigureAction
-  warn verbosity $ "Configure lock released for " ++ interpretSymbolicPath mbWorkDir build_dir
-  --- END MODIFICATION: Apply Locking ---
+  warn verbosity $ "Configure lock released for " ++ configureFile'
+
   where
     args = configureArgs backwardsCompatHack cfg
     backwardsCompatHack = False

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

@@ -1836,7 +1836,7 @@ elaborateInstallPlan
                   PD.Custom -> [CuzBuildType CuzCustomBuildType]
                   PD.Hooks -> [CuzBuildType CuzHooksBuildType]
                   PD.Make -> [CuzBuildType CuzMakeBuildType]
-                  PD.Simple -> []
+                  _ -> []
               -- cabal-format versions prior to 1.8 have different build-depends semantics
               -- for now it's easier to just fallback to legacy-mode when specVersion < 1.8
               -- see, https://github.com/haskell/cabal/issues/4121