[commit: ghc] master: DynFlags: drop tracking of '-#include' flags (7953b27)
git at git.haskell.org
git at git.haskell.org
Tue Feb 9 17:50:35 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/7953b27cdc331d97f605ae17f0c514f3e386023d/ghc
>---------------------------------------------------------------
commit 7953b27cdc331d97f605ae17f0c514f3e386023d
Author: Sergei Trofimovich <siarheit at google.com>
Date: Sun Jan 3 12:07:10 2016 +0000
DynFlags: drop tracking of '-#include' flags
GHC does not use passed paramaters anywhere
for this deprecated option.
Signed-off-by: Sergei Trofimovich <siarheit at google.com>
>---------------------------------------------------------------
7953b27cdc331d97f605ae17f0c514f3e386023d
compiler/main/DynFlags.hs | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 0fa7434..3cd72bf 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -665,7 +665,6 @@ data DynFlags = DynFlags {
historySize :: Int,
- cmdlineHcIncludes :: [String], -- ^ @\-\#includes@
importPaths :: [FilePath],
mainModIs :: Module,
mainFunIs :: Maybe String,
@@ -1453,7 +1452,6 @@ defaultDynFlags mySettings =
enableTimeStats = False,
ghcHeapSize = Nothing,
- cmdlineHcIncludes = [],
importPaths = ["."],
mainModIs = mAIN,
mainFunIs = Nothing,
@@ -2247,8 +2245,7 @@ dynamic_flags = [
, defFlag "cpp" (NoArg (setExtensionFlag LangExt.Cpp))
, defFlag "F" (NoArg (setGeneralFlag Opt_Pp))
, defFlag "#include"
- (HasArg (\s -> do
- addCmdlineHCInclude s
+ (HasArg (\_s -> do
addWarn ("-#include and INCLUDE pragmas are " ++
"deprecated: They no longer have any effect")))
, defFlag "v" (OptIntSuffix setVerbosity)
@@ -3856,9 +3853,6 @@ setVerbosity mb_n = upd (\dfs -> dfs{ verbosity = mb_n `orElse` 3 })
setDebugLevel :: Maybe Int -> DynP ()
setDebugLevel mb_n = upd (\dfs -> dfs{ debugLevel = mb_n `orElse` 2 })
-addCmdlineHCInclude :: String -> DynP ()
-addCmdlineHCInclude a = upd (\s -> s{cmdlineHcIncludes = a : cmdlineHcIncludes s})
-
data PkgConfRef
= GlobalPkgConf
| UserPkgConf
More information about the ghc-commits
mailing list