more fixups

Author: sheaf

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

@@ -183,6 +183,8 @@ configure
             }
   (_allConstraints, pkgInfo) <-
     Cabal.computePackageInfo cfg lbc1 gpkgDescr compil
+  -- NB: no need to re-apply "allConstraints", as we already have a
+  -- finalized package description in hand.
 
   -- Post-configure hooks & per-component configure
   lbi1 <- Cabal.configureFinal

cabal-install/tests/UnitTests/Distribution/Client/Configure.hs

@@ -138,7 +138,8 @@ configureTests =
         assertEqual
           "local"
           (Just ghcFlags)
-          (Map.lookup "ghc" (getMapMappend (packageConfigProgramArgs projectConfigLocalPackages)))
+          (filter (/= "-hide-all-packages") <$> --hide-all-packages gets added by default; ignore it for this test
+            Map.lookup "ghc" (getMapMappend (packageConfigProgramArgs projectConfigLocalPackages)))
     ]
 
 projectDir :: FilePath