diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2009-09-11 11:49:28 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2009-09-11 11:49:28 +0000 |
| commit | 1dc3f29333773551f60dce638ed7309041d7c800 (patch) | |
| tree | dde9cae554ce34e533440f7408487f72055c1c8a /compiler/main/Packages.lhs | |
| parent | a2797404fc2783552544a38a3e38e16b4dce29a5 (diff) | |
| download | haskell-1dc3f29333773551f60dce638ed7309041d7c800.tar.gz | |
Remove the old package.conf parser, use read instead (fixed #3410)
Performance isn't an issue for reading the old-style package.conf
files, so we might as well revert to using read and fix a bug at the
same time.
Diffstat (limited to 'compiler/main/Packages.lhs')
| -rw-r--r-- | compiler/main/Packages.lhs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs index 0cfd00f9ff..92a5153b97 100644 --- a/compiler/main/Packages.lhs +++ b/compiler/main/Packages.lhs @@ -36,7 +36,6 @@ where #include "HsVersions.h" import PackageConfig -import ParsePkgConf ( loadPackageConfig ) import DynFlags ( dopt, DynFlag(..), DynFlags(..), PackageFlag(..) ) import StaticFlags import Config ( cProjectVersion ) @@ -237,7 +236,8 @@ readPackageConfig dflags conf_file = do ghcError $ InstallationError $ "can't find a package database at " ++ conf_file debugTraceMsg dflags 2 (text "Using package config file:" <+> text conf_file) - loadPackageConfig dflags conf_file + str <- readFile conf_file + return (map installedPackageInfoToPackageConfig $ read str) let top_dir = topDir dflags |