Merge pull request #4787 from 23Skidoo/old-cabals-custom-setup

SetupWrapper: Assume that old Cabals bootstrap.
haskell · Oct 15, 2017 · 63f1490 · 63f1490
2 parents 663d5c6 + ff3f515
commit 63f1490
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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')