[commit: ghc] wip/nfs-locking: Fix HsCpp argument list. (555265c)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/555265ce0686be733a2a3f66abbab1bc8771d237/ghc

>---------------------------------------------------------------

commit 555265ce0686be733a2a3f66abbab1bc8771d237
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Sep 24 23:45:01 2015 +0100

    Fix HsCpp argument list.


>---------------------------------------------------------------

555265ce0686be733a2a3f66abbab1bc8771d237
 src/Settings/Builders/HsCpp.hs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Settings/Builders/HsCpp.hs b/src/Settings/Builders/HsCpp.hs
index da104cc..cad2897 100644
--- a/src/Settings/Builders/HsCpp.hs
+++ b/src/Settings/Builders/HsCpp.hs
@@ -1,6 +1,7 @@
 module Settings.Builders.HsCpp (hsCppArgs) where
 
 import Expression
+import Oracles
 import Predicates (builder)
 import Settings.Builders.GhcCabal
 
@@ -9,9 +10,11 @@ hsCppArgs :: Args
 hsCppArgs = builder HsCpp ? do
     stage <- getStage
     src   <- getSource
-    mconcat [ arg "-P"
+    args  <- getSettingList HsCppArgs
+    mconcat [ append args
+            , arg "-P"
             , cppArgs
-            , arg $ "-Icompiler/stage" ++ show stage
+            , arg $ "-Icompiler/stage" ++ show (succ stage)
             , arg "-x"
             , arg "c"
             , arg src ]