diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-06-26 20:27:49 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-06-26 20:27:49 +0000 |
| commit | a11bb49b97eaba892730baf1565e922715dbc07f (patch) | |
| tree | b9ebdf37ef6329cd8c836aec5a2aca78b55ba70a /compiler/main/Packages.lhs | |
| parent | abd113f06ebf3ac29f852e80c5a8c0060f979202 (diff) | |
| download | haskell-a11bb49b97eaba892730baf1565e922715dbc07f.tar.gz | |
Follow Cabal changes
Diffstat (limited to 'compiler/main/Packages.lhs')
| -rw-r--r-- | compiler/main/Packages.lhs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs index 712682eaaf..41a760af36 100644 --- a/compiler/main/Packages.lhs +++ b/compiler/main/Packages.lhs @@ -318,7 +318,7 @@ matchingPackages str pkgs -- version, or just the name if it is unambiguous. matches str p = str == display (package p) - || str == pkgName (package p) + || str == display (pkgName (package p)) pickPackages :: [PackageConfig] -> [String] -> [PackageConfig] pickPackages pkgs strs = @@ -387,7 +387,7 @@ findWiredInPackages dflags pkgs preload this_package = do matches :: PackageConfig -> (PackageId, [String]) -> Bool pc `matches` (pid, suffixes) - = pkgName (package pc) `elem` + = display (pkgName (package pc)) `elem` (map (packageIdString pid ++) suffixes) -- find which package corresponds to each wired-in package @@ -445,7 +445,7 @@ findWiredInPackages dflags pkgs preload this_package = do upd_pid pid = case filter ((== pid) . fst) wired_in_ids of [] -> pid - ((x, y):_) -> x{ pkgName = packageIdString y, + ((x, y):_) -> x{ pkgName = PackageName (packageIdString y), pkgVersion = Version [] [] } pkgs1 = deleteOtherWiredInPackages pkgs |