From ff3f5154170ceff47a41ed179c26a0470f49f073 Mon Sep 17 00:00:00 2001 From: Mikhail Glushenkov Date: Fri, 22 Sep 2017 15:00:15 +0100 Subject: [PATCH] SetupWrapper: Assume that old Cabals bootstrap. See https://github.com/haskell/cabal/commit/e2bf243300957321497353a2f85517e464f764ab#commitcomment-24487898. --- cabal-install/Distribution/Client/SetupWrapper.hs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cabal-install/Distribution/Client/SetupWrapper.hs b/cabal-install/Distribution/Client/SetupWrapper.hs index 4fd1ec1cf01..310631bcec7 100644 --- a/cabal-install/Distribution/Client/SetupWrapper.hs +++ b/cabal-install/Distribution/Client/SetupWrapper.hs @@ -707,6 +707,9 @@ getExternalSetupMethod verbosity options pkg bt = do installedCabalVersion :: SetupScriptOptions -> Compiler -> ProgramDb -> IO (Version, Maybe InstalledPackageId ,SetupScriptOptions) + installedCabalVersion options' _ _ | packageName pkg == mkPackageName "Cabal" + && bt == Custom = + return (packageVersion pkg, Nothing, options') installedCabalVersion options' compiler progdb = do index <- maybeGetInstalledPackages options' compiler progdb let cabalDep = Dependency (mkPackageName "Cabal") (useCabalVersion options')