Commit 16836efe authored by Mikhail Glushenkov's avatar Mikhail Glushenkov
Browse files

'cabal configure': honor the '--constraint' flag.

Fixes #1150. Fixes #1564.
parent 9dc4ad74
...@@ -45,7 +45,7 @@ import Distribution.PackageDescription.Configuration ...@@ -45,7 +45,7 @@ import Distribution.PackageDescription.Configuration
import Distribution.Version import Distribution.Version
( anyVersion, thisVersion ) ( anyVersion, thisVersion )
import Distribution.Simple.Utils as Utils import Distribution.Simple.Utils as Utils
( notice, info, debug, die ) ( notice, debug, die )
import Distribution.System import Distribution.System
( Platform ) ( Platform )
import Distribution.Verbosity as Verbosity import Distribution.Verbosity as Verbosity
...@@ -77,10 +77,7 @@ configure verbosity packageDBs repos comp platform conf ...@@ -77,10 +77,7 @@ configure verbosity packageDBs repos comp platform conf
maybePlan <- foldProgress logMsg (return . Left) (return . Right) maybePlan <- foldProgress logMsg (return . Left) (return . Right)
progress progress
case maybePlan of case maybePlan of
Left message -> do Left message -> die message
info verbosity message
setupWrapper verbosity (setupScriptOptions installedPkgIndex) Nothing
configureCommand (const configFlags) extraArgs
Right installPlan -> case InstallPlan.ready installPlan of Right installPlan -> case InstallPlan.ready installPlan of
[pkg@(ConfiguredPackage (SourcePackage _ _ (LocalUnpackedPackage _) _) _ _ _)] -> [pkg@(ConfiguredPackage (SourcePackage _ _ (LocalUnpackedPackage _) _) _ _ _)] ->
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment