[commit: ghc] ghc-8.0: DynFlags: drop tracking of '-#include' flags (63e7d45)
git at git.haskell.org
git at git.haskell.org
Thu Feb 11 15:30:26 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-8.0
Link : http://ghc.haskell.org/trac/ghc/changeset/63e7d45c575b05f5e48df5f7d942f1c6b638774d/ghc
>---------------------------------------------------------------
commit 63e7d45c575b05f5e48df5f7d942f1c6b638774d
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>
(cherry picked from commit 7953b27cdc331d97f605ae17f0c514f3e386023d)
>---------------------------------------------------------------
63e7d45c575b05f5e48df5f7d942f1c6b638774d
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 5f7f7ca..86c8468 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -664,7 +664,6 @@ data DynFlags = DynFlags {
historySize :: Int,
- cmdlineHcIncludes :: [String], -- ^ @\-\#includes@
importPaths :: [FilePath],
mainModIs :: Module,
mainFunIs :: Maybe String,
@@ -1454,7 +1453,6 @@ defaultDynFlags mySettings =
enableTimeStats = False,
ghcHeapSize = Nothing,
- cmdlineHcIncludes = [],
importPaths = ["."],
mainModIs = mAIN,
mainFunIs = Nothing,
@@ -2243,8 +2241,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)
@@ -3851,9 +3848,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