projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-01-03 17:09:13 by simonmar]
[ghc-hetmet.git]
/
ghc
/
compiler
/
main
/
Packages.lhs
diff --git
a/ghc/compiler/main/Packages.lhs
b/ghc/compiler/main/Packages.lhs
index
3503d46
..
7c18904
100644
(file)
--- a/
ghc/compiler/main/Packages.lhs
+++ b/
ghc/compiler/main/Packages.lhs
@@
-14,11
+14,10
@@
where
#include "HsVersions.h"
import Pretty
#include "HsVersions.h"
import Pretty
-import SysTools ( dosifyPath )
import CmdLineOpts ( dynFlag, verbosity )
import DriverUtil ( my_prefix_match )
import ErrUtils ( dumpIfSet )
import CmdLineOpts ( dynFlag, verbosity )
import DriverUtil ( my_prefix_match )
import ErrUtils ( dumpIfSet )
-import Outputable ( docToSDoc, trace )
+import Outputable ( docToSDoc )
\end{code}
\begin{code}
\end{code}
\begin{code}
@@
-38,9
+37,8
@@
import Outputable ( docToSDoc, trace )
\begin{code}
mungePackagePaths :: String -> [PackageConfig] -> [PackageConfig]
\begin{code}
mungePackagePaths :: String -> [PackageConfig] -> [PackageConfig]
--- a) replace the string "$libdir" at the beginning of a path with the
--- current libdir (obtained from the -B option).
--- b) dosify the paths [paths in the package-conf file aren't DOS style]
+-- Replace the string "$libdir" at the beginning of a path
+-- with the current libdir (obtained from the -B option).
mungePackagePaths top_dir ps = map munge_pkg ps
where
munge_pkg p = p{ import_dirs = munge_paths (import_dirs p),
mungePackagePaths top_dir ps = map munge_pkg ps
where
munge_pkg p = p{ import_dirs = munge_paths (import_dirs p),
@@
-50,8
+48,8
@@
mungePackagePaths top_dir ps = map munge_pkg ps
munge_paths = map munge_path
munge_path p
munge_paths = map munge_path
munge_path p
- | Just p' <- my_prefix_match "$libdir" p = dosifyPath (top_dir ++ p')
- | otherwise = trace ("not: " ++ p) p
+ | Just p' <- my_prefix_match "$libdir" p = top_dir ++ p'
+ | otherwise = p
\end{code}
\end{code}
@@
-63,10
+61,10
@@
mungePackagePaths top_dir ps = map munge_pkg ps
\begin{code}
showPackages :: [PackageConfig] -> IO ()
\begin{code}
showPackages :: [PackageConfig] -> IO ()
--- Show package info on console, if verbosity is >=2
+-- Show package info on console, if verbosity is >= 3
showPackages ps
= do { verb <- dynFlag verbosity
showPackages ps
= do { verb <- dynFlag verbosity
- ; dumpIfSet (verb >= 2) "Packages"
+ ; dumpIfSet (verb >= 3) "Packages"
(docToSDoc (vcat (map dumpPkgGuts ps)))
}
\end{code}
(docToSDoc (vcat (map dumpPkgGuts ps)))
}
\end{code}