[commit: ghc] wip/nfs-locking: Fix custom settings of the compiler package. (3090409)

[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/3090409f9a90cda50892d25f02ea3e3a55f43121/ghc

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

commit 3090409f9a90cda50892d25f02ea3e3a55f43121
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Jul 26 17:04:23 2015 +0100

    Fix custom settings of the compiler package.


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

3090409f9a90cda50892d25f02ea3e3a55f43121
 src/Settings/GhcCabal.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Settings/GhcCabal.hs b/src/Settings/GhcCabal.hs
index cba05cc..2c475ab 100644
--- a/src/Settings/GhcCabal.hs
+++ b/src/Settings/GhcCabal.hs
@@ -149,6 +149,7 @@ customPackageArgs = do
         , package compiler ?
           builder GhcCabal ?
           mconcat [ arg $ "--ghc-option=-DSTAGE=" ++ show (succ stage)
+                  , arg $ "--flags=stage" ++ show (succ stage)
                   , arg "--disable-library-for-ghci"
                   , targetOs "openbsd" ? arg "--ld-options=-E"
                   , flag GhcUnregisterised ? arg "--ghc-option=-DNO_REGS"
@@ -157,7 +158,8 @@ customPackageArgs = do
                   , (threaded `elem` rtsWays) ?
                     notStage0 ? arg "--ghc-option=-optc-DTHREADED_RTS"
                   , ghcWithNativeCodeGen ? arg "--flags=ncg"
-                  , ghcWithInterpreter ? arg "--flags=ghci"
+                  , ghcWithInterpreter ?
+                    notStage0 ? arg "--flags=ghci"
                   , ghcWithInterpreter ?
                     ghcEnableTablesNextToCode ?
                     notP (flag GhcUnregisterised) ?