diff options
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/DynFlags.hs | 16 | ||||
| -rw-r--r-- | compiler/main/Packages.lhs | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index f49da9358f..7d22a7b138 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -551,7 +551,7 @@ data DynFlags = DynFlags { -- Package flags extraPkgConfs :: [PkgConfRef], - -- ^ The @-package-conf@ flags given on the command line, in the order + -- ^ The @-package-db@ flags given on the command line, in the order -- they appeared. packageFlags :: [PackageFlag], @@ -1342,7 +1342,7 @@ parseDynamicFlagsCmdLine :: Monad m => parseDynamicFlagsCmdLine dflags args = parseDynamicFlags dflags args True -- | Like 'parseDynamicFlagsCmdLine' but does not allow the package flags --- (-package, -hide-package, -ignore-package, -hide-all-packages, -package-conf). +-- (-package, -hide-package, -ignore-package, -hide-all-packages, -package-db). -- Used to parse flags set in a modules pragma. parseDynamicFilePragma :: Monad m => DynFlags -> [Located String] @@ -1757,12 +1757,12 @@ dynamic_flags = [ package_flags :: [Flag (CmdLineP DynFlags)] package_flags = [ ------- Packages ---------------------------------------------------- - Flag "package-conf" (HasArg (extraPkgConf_ . PkgConfFile)) - , Flag "clear-package-conf" (NoArg clearPkgConf) - , Flag "no-global-package-conf" (NoArg (unSetDynFlag Opt_ReadGlobalPackageConf)) - , Flag "no-user-package-conf" (NoArg (unSetDynFlag Opt_ReadUserPackageConf)) - , Flag "global-package-conf" (NoArg (extraPkgConf_ GlobalPkgConf)) - , Flag "user-package-conf" (NoArg (extraPkgConf_ UserPkgConf)) + Flag "package-db" (HasArg (extraPkgConf_ . PkgConfFile)) + , Flag "clear-package-db" (NoArg clearPkgConf) + , Flag "no-global-package-db" (NoArg (unSetDynFlag Opt_ReadGlobalPackageConf)) + , Flag "no-user-package-db" (NoArg (unSetDynFlag Opt_ReadUserPackageConf)) + , Flag "global-package-db" (NoArg (extraPkgConf_ GlobalPkgConf)) + , Flag "user-package-db" (NoArg (extraPkgConf_ UserPkgConf)) , Flag "package-name" (hasArg setPackageName) , Flag "package-id" (HasArg exposePackageId) diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs index 12aefc0308..6d917fa327 100644 --- a/compiler/main/Packages.lhs +++ b/compiler/main/Packages.lhs @@ -184,10 +184,10 @@ initPackages dflags = do readPackageConfigs :: DynFlags -> IO [PackageConfig] readPackageConfigs dflags = do - let -- Read global package db, unless the -no-user-package-conf flag was given + let -- Read global package db, unless the -no-user-package-db flag was given global_conf_refs = [GlobalPkgConf | dopt Opt_ReadGlobalPackageConf dflags] -- Read user's package conf (eg. ~/.ghc/i386-linux-6.3/package.conf) - -- unless the -no-user-package-conf flag was given. + -- unless the -no-user-package-db flag was given. user_conf_refs = [UserPkgConf | dopt Opt_ReadUserPackageConf dflags] system_conf_refs = global_conf_refs ++ user_conf_refs |