Torsten Schmits pushed to branch wip/torsten.schmits/mwb-26-01/mp-backports at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • compiler/GHC/Unit/State.hs
    ... ... @@ -1401,10 +1401,11 @@ mergeDatabases logger = foldM merge (emptyUniqMap, emptyUniqMap) . zip [1..]
    1401 1401
         merge (pkg_map, prec_map) (i, UnitDatabase db_path db) = do
    
    1402 1402
           debugTraceMsg logger 2 $
    
    1403 1403
               text "loading package database" <+> OsPath.pprOsPath db_path
    
    1404
    -      forM_ (Set.toList override_set) $ \pkg ->
    
    1405
    -          debugTraceMsg logger 2 $
    
    1406
    -              text "package" <+> ppr pkg <+>
    
    1407
    -              text "overrides a previously defined package"
    
    1404
    +      when (log_verbosity (logFlags logger) >= 2) $
    
    1405
    +        forM_ (Set.toList override_set) $ \pkg ->
    
    1406
    +            debugTraceMsg logger 2 $
    
    1407
    +                text "package" <+> ppr pkg <+>
    
    1408
    +                text "overrides a previously defined package"
    
    1408 1409
           return (pkg_map', prec_map')
    
    1409 1410
          where
    
    1410 1411
           db_map = mk_pkg_map db
    
    ... ... @@ -2382,4 +2383,3 @@ implicitPackageDeps dflags
    2382 2383
        = [thUnitId | xopt TemplateHaskellQuotes dflags]
    
    2383 2384
        -- TODO: Should also include `base` and `ghc-prim` if we use those implicitly, but
    
    2384 2385
        -- it is possible to not depend on base (for example, see `ghc-prim`)
    2385
    -