where myname = pkgName (package p)
myversion = pkgVersion (package p)
a_later_version_is_exposed
- = not (null [ p | p <- pkgs1, let pkg = package p,
+ = not (null [ p | p <- pkgs1, exposed p,
+ let pkg = package p,
pkgName pkg == myname,
pkgVersion pkg > myversion ])
--
-- _dyn to extraLibraries if they already have a _cbits suffix.
hACK_dyn = map hack
- where hack lib | not static && "_cbits" `isSuffixOf` lib = lib ++ "_dyn"
+ where hack lib | not opt_Static && "_cbits" `isSuffixOf` lib = lib ++ "_dyn"
| otherwise = lib
return (concat (map all_opts ps))
| p `elem` ps = return ps -- Check if we've already added this package
| otherwise =
case lookupPackage pkg_db p of
- Nothing -> Failed (missingPackageErr (packageIdString p))
+ Nothing -> Failed (missingPackageMsg (packageIdString p))
Just pkg -> do
-- Add the package's dependents also
let deps = map mkPackageId (depends pkg)
return (p : ps')
missingPackageErr p = throwDyn (CmdLineError (showSDoc (missingPackageMsg p)))
-missingPackageMsg p = ptext SLIT("unknown package:") <> text p
+missingPackageMsg p = ptext SLIT("unknown package:") <+> text p
-- -----------------------------------------------------------------------------
-- The home module set