From 1c115be18561a6537ae8860a50ca9564960500dd Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Tue, 22 Jul 2008 16:33:08 +0000 Subject: [PATCH] Add replacements for the -optdep flags, and deprecate the old ones --- compiler/main/DynFlags.hs | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 1449187..11fd02b 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -1106,15 +1106,24 @@ dynamic_flags = [ Supported -------- ghc -M ----------------------------------------------------- - , Flag "optdep-s" (HasArg (upd . addDepSuffix)) Supported - , Flag "optdep-f" (HasArg (upd . setDepMakefile)) Supported + , Flag "dep-suffix" (HasArg (upd . addDepSuffix)) Supported + , Flag "optdep-s" (HasArg (upd . addDepSuffix)) + (Deprecated "Use -dep-suffix instead") + , Flag "dep-makefile" (HasArg (upd . setDepMakefile)) Supported + , Flag "optdep-f" (HasArg (upd . setDepMakefile)) + (Deprecated "Use -dep-makefile instead") , Flag "optdep-w" (NoArg (upd (setDepWarnings False))) (Deprecated "-optdep-w doesn't do anything") + , Flag "include-pkg-deps" (NoArg (upd (setDepIncludePkgDeps True))) Supported , Flag "optdep--include-prelude" (NoArg (upd (setDepIncludePkgDeps True))) - (Deprecated "Use -optdep--include-pkg-deps instead") - , Flag "optdep--include-pkg-deps" (NoArg (upd (setDepIncludePkgDeps True))) Supported - , Flag "optdep--exclude-module" (HasArg (upd . addDepExcludeMod)) Supported - , Flag "optdep-x" (HasArg (upd . addDepExcludeMod)) Supported + (Deprecated "Use -include-pkg-deps instead") + , Flag "optdep--include-pkg-deps" (NoArg (upd (setDepIncludePkgDeps True))) + (Deprecated "Use -include-pkg-deps instead") + , Flag "exclude-module" (HasArg (upd . addDepExcludeMod)) Supported + , Flag "optdep--exclude-module" (HasArg (upd . addDepExcludeMod)) + (Deprecated "Use -exclude-module instead") + , Flag "optdep-x" (HasArg (upd . addDepExcludeMod)) + (Deprecated "Use -exclude-module instead") -------- Linking ---------------------------------------------------- , Flag "c" (NoArg (upd $ \d -> d{ ghcLink=NoLink } )) -- 1.7.10.4