[commit: ghc] wip/nfs-locking: Add missing flags for Parser module (3201312)
git at git.haskell.org
git at git.haskell.org
Fri Oct 27 00:29:34 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/nfs-locking
Link : http://ghc.haskell.org/trac/ghc/changeset/3201312c71ea91128a11942ff66792f175bed255/ghc
>---------------------------------------------------------------
commit 3201312c71ea91128a11942ff66792f175bed255
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Fri Jan 6 02:33:02 2017 +0000
Add missing flags for Parser module
See #268
>---------------------------------------------------------------
3201312c71ea91128a11942ff66792f175bed255
src/Settings/Flavours/Perf.hs | 2 +-
src/Settings/Flavours/Prof.hs | 2 +-
src/Settings/Flavours/Quick.hs | 2 +-
src/Settings/Flavours/Quickest.hs | 2 +-
src/Settings/Packages/Compiler.hs | 6 ++++--
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/Settings/Flavours/Perf.hs b/src/Settings/Flavours/Perf.hs
index d246b15..7641657 100644
--- a/src/Settings/Flavours/Perf.hs
+++ b/src/Settings/Flavours/Perf.hs
@@ -9,7 +9,7 @@ import {-# SOURCE #-} Settings.Default
perfFlavour :: Flavour
perfFlavour = defaultFlavour
{ name = "perf"
- , args = defaultArgs <> perfArgs }
+ , args = defaultBuilderArgs <> perfArgs <> defaultPackageArgs }
optimise :: Context -> Bool
optimise Context {..} =
diff --git a/src/Settings/Flavours/Prof.hs b/src/Settings/Flavours/Prof.hs
index 4dee8fc..6d94b90 100644
--- a/src/Settings/Flavours/Prof.hs
+++ b/src/Settings/Flavours/Prof.hs
@@ -9,7 +9,7 @@ import {-# SOURCE #-} Settings.Default
profFlavour :: Flavour
profFlavour = defaultFlavour
{ name = "prof"
- , args = defaultArgs <> profArgs
+ , args = defaultBuilderArgs <> profArgs <> defaultPackageArgs
, ghcProfiled = True }
optimise :: Context -> Bool
diff --git a/src/Settings/Flavours/Quick.hs b/src/Settings/Flavours/Quick.hs
index 448a875..1e4f5c0 100644
--- a/src/Settings/Flavours/Quick.hs
+++ b/src/Settings/Flavours/Quick.hs
@@ -9,7 +9,7 @@ import {-# SOURCE #-} Settings.Default
quickFlavour :: Flavour
quickFlavour = defaultFlavour
{ name = "quick"
- , args = defaultArgs <> quickArgs
+ , args = defaultBuilderArgs <> quickArgs <> defaultPackageArgs
, libraryWays = defaultLibraryWays <> quickLibraryWays }
optimise :: Context -> Bool
diff --git a/src/Settings/Flavours/Quickest.hs b/src/Settings/Flavours/Quickest.hs
index 9f9b85b..477a245 100644
--- a/src/Settings/Flavours/Quickest.hs
+++ b/src/Settings/Flavours/Quickest.hs
@@ -7,7 +7,7 @@ import {-# SOURCE #-} Settings.Default
quickestFlavour :: Flavour
quickestFlavour = defaultFlavour
{ name = "quickest"
- , args = defaultArgs <> quickestArgs
+ , args = defaultBuilderArgs <> quickestArgs <> defaultPackageArgs
, libraryWays = defaultLibraryWays <> quickestLibraryWays }
quickestArgs :: Args
diff --git a/src/Settings/Packages/Compiler.hs b/src/Settings/Packages/Compiler.hs
index 9280a81..8cc05cb 100644
--- a/src/Settings/Packages/Compiler.hs
+++ b/src/Settings/Packages/Compiler.hs
@@ -15,8 +15,10 @@ compilerPackageArgs = package compiler ? do
path <- getBuildPath
mconcat [ builder Alex ? arg "--latin1"
- , builder (Ghc CompileHs) ?
- inputs ["//GHC.hs", "//GhcMake.hs"] ? arg "-fprof-auto"
+ , builder (Ghc CompileHs) ? mconcat
+ [ inputs ["//GHC.hs", "//GhcMake.hs"] ? arg "-fprof-auto"
+ , input "//Parser.hs" ?
+ append ["-O0", "-fno-ignore-interface-pragmas", "-fcmm-sink" ] ]
, builder GhcCabal ? mconcat
[ arg $ "--ghc-option=-DSTAGE=" ++ show (fromEnum stage + 1)
More information about the ghc-commits
mailing list