projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure runhaskell is rebuild in stage2
[ghc-hetmet.git]
/
compiler
/
main
/
Packages.lhs
diff --git
a/compiler/main/Packages.lhs
b/compiler/main/Packages.lhs
index
9820854
..
6a5b63c
100644
(file)
--- a/
compiler/main/Packages.lhs
+++ b/
compiler/main/Packages.lhs
@@
-19,7
+19,6
@@
module Packages (
-- * Inspecting the set of packages in scope
getPackageIncludePath,
-- * Inspecting the set of packages in scope
getPackageIncludePath,
- getPackageCIncludes,
getPackageLibraryPath,
getPackageLinkOpts,
getPackageExtraCcOpts,
getPackageLibraryPath,
getPackageLinkOpts,
getPackageExtraCcOpts,
@@
-48,8
+47,8
@@
import Panic
import Outputable
import System.Environment ( getEnv )
import Outputable
import System.Environment ( getEnv )
-import Distribution.InstalledPackageInfo
-import Distribution.Package
+import Distribution.InstalledPackageInfo hiding (depends)
+import Distribution.Package hiding (depends)
import Distribution.Version
import FastString
import ErrUtils ( debugTraceMsg, putMsg, Message )
import Distribution.Version
import FastString
import ErrUtils ( debugTraceMsg, putMsg, Message )
@@
-318,7
+317,7
@@
matchingPackages str pkgs
-- A package named on the command line can either include the
-- version, or just the name if it is unambiguous.
matches str p
-- A package named on the command line can either include the
-- version, or just the name if it is unambiguous.
matches str p
- = str == showPackageId (package p)
+ = str == display (package p)
|| str == pkgName (package p)
pickPackages :: [PackageConfig] -> [String] -> [PackageConfig]
|| str == pkgName (package p)
pickPackages :: [PackageConfig] -> [String] -> [PackageConfig]
@@
-346,10
+345,10
@@
hideOldPackages dflags pkgs = mapM maybe_hide pkgs
| not (exposed p) = return p
| (p' : _) <- later_versions = do
debugTraceMsg dflags 2 $
| not (exposed p) = return p
| (p' : _) <- later_versions = do
debugTraceMsg dflags 2 $
- (ptext SLIT("hiding package") <+>
- text (showPackageId (package p)) <+>
- ptext SLIT("to avoid conflict with later version") <+>
- text (showPackageId (package p')))
+ (ptext (sLit "hiding package") <+>
+ text (display (package p)) <+>
+ ptext (sLit "to avoid conflict with later version") <+>
+ text (display (package p')))
return (p {exposed=False})
| otherwise = return p
where myname = pkgName (package p)
return (p {exposed=False})
| otherwise = return p
where myname = pkgName (package p)
@@
-409,16
+408,16
@@
findWiredInPackages dflags pkgs preload this_package = do
where
notfound = do
debugTraceMsg dflags 2 $
where
notfound = do
debugTraceMsg dflags 2 $
- ptext SLIT("wired-in package ")
+ ptext (sLit "wired-in package ")
<> text wired_pkg
<> text wired_pkg
- <> ptext SLIT(" not found.")
+ <> ptext (sLit " not found.")
return Nothing
pick pkg = do
debugTraceMsg dflags 2 $
return Nothing
pick pkg = do
debugTraceMsg dflags 2 $
- ptext SLIT("wired-in package ")
+ ptext (sLit "wired-in package ")
<> text wired_pkg
<> text wired_pkg
- <> ptext SLIT(" mapped to ")
- <> text (showPackageId (package pkg))
+ <> ptext (sLit " mapped to ")
+ <> text (display (package pkg))
return (Just (package pkg))
return (Just (package pkg))
@@
-484,9
+483,9
@@
elimDanglingDeps dflags pkgs ignored = go [] pkgs'
reportElim (p, deps) =
debugTraceMsg dflags 2 $
reportElim (p, deps) =
debugTraceMsg dflags 2 $
- (ptext SLIT("package") <+> pprPkg p <+>
- ptext SLIT("will be ignored due to missing or recursive dependencies:") $$
- nest 2 (hsep (map (text.showPackageId) deps)))
+ (ptext (sLit "package") <+> pprPkg p <+>
+ ptext (sLit "will be ignored due to missing or recursive dependencies:") $$
+ nest 2 (hsep (map (text.display) deps)))
-- -----------------------------------------------------------------------------
-- When all the command-line options are in, we can process our package
-- -----------------------------------------------------------------------------
-- When all the command-line options are in, we can process our package
@@
-575,7
+574,7
@@
mkModuleMap pkg_db = foldr extend_modmap emptyUFM pkgids
hidden_mods = hiddenModules pkg
pprPkg :: PackageConfig -> SDoc
hidden_mods = hiddenModules pkg
pprPkg :: PackageConfig -> SDoc
-pprPkg p = text (showPackageId (package p))
+pprPkg p = text (display (package p))
-- -----------------------------------------------------------------------------
-- Extracting information from the packages in scope
-- -----------------------------------------------------------------------------
-- Extracting information from the packages in scope
@@
-593,11
+592,6
@@
getPackageIncludePath dflags pkgs = do
ps <- getPreloadPackagesAnd dflags pkgs
return (nub (filter notNull (concatMap includeDirs ps)))
ps <- getPreloadPackagesAnd dflags pkgs
return (nub (filter notNull (concatMap includeDirs ps)))
- -- includes are in reverse dependency order (i.e. rts first)
-getPackageCIncludes :: [PackageConfig] -> IO [String]
-getPackageCIncludes pkg_configs = do
- return (reverse (nub (filter notNull (concatMap includes pkg_configs))))
-
getPackageLibraryPath :: DynFlags -> [PackageId] -> IO [String]
getPackageLibraryPath dflags pkgs = do
ps <- getPreloadPackagesAnd dflags pkgs
getPackageLibraryPath :: DynFlags -> [PackageId] -> IO [String]
getPackageLibraryPath dflags pkgs = do
ps <- getPreloadPackagesAnd dflags pkgs
@@
-695,12
+689,12
@@
missingPackageErr :: String -> IO [PackageConfig]
missingPackageErr p = throwDyn (CmdLineError (showSDoc (missingPackageMsg p)))
missingPackageMsg :: String -> SDoc
missingPackageErr p = throwDyn (CmdLineError (showSDoc (missingPackageMsg p)))
missingPackageMsg :: String -> SDoc
-missingPackageMsg p = ptext SLIT("unknown package:") <+> text p
+missingPackageMsg p = ptext (sLit "unknown package:") <+> text p
missingDependencyMsg :: Maybe PackageId -> SDoc
missingDependencyMsg Nothing = empty
missingDependencyMsg (Just parent)
missingDependencyMsg :: Maybe PackageId -> SDoc
missingDependencyMsg Nothing = empty
missingDependencyMsg (Just parent)
- = space <> parens (ptext SLIT("dependency of") <+> ftext (packageIdFS parent))
+ = space <> parens (ptext (sLit "dependency of") <+> ftext (packageIdFS parent))
-- -----------------------------------------------------------------------------
-- -----------------------------------------------------------------------------
@@
-720,8
+714,8
@@
dumpPackages dflags
putMsg dflags $
vcat (map (text.showInstalledPackageInfo.to_ipi) (eltsUFM pkg_map))
where
putMsg dflags $
vcat (map (text.showInstalledPackageInfo.to_ipi) (eltsUFM pkg_map))
where
- to_ipi pkgconf@InstalledPackageInfo_{ exposedModules = e,
- hiddenModules = h } =
+ to_ipi pkgconf@(InstalledPackageInfo { exposedModules = e,
+ hiddenModules = h }) =
pkgconf{ exposedModules = map moduleNameString e,
hiddenModules = map moduleNameString h }
\end{code}
pkgconf{ exposedModules = map moduleNameString e,
hiddenModules = map moduleNameString h }
\end{code}