[commit: ghc] master: compiler/ghc.mk: fix GhcWithInterpreter=NO build failure (03e3425)

git at git.haskell.org git at git.haskell.org
Sun Apr 2 13:14:29 UTC 2017


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/03e34256e2cba964adf6dcdb1682618f26400b3a/ghc

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

commit 03e34256e2cba964adf6dcdb1682618f26400b3a
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Sun Apr 2 14:01:19 2017 +0100

    compiler/ghc.mk: fix GhcWithInterpreter=NO build failure
    
    When GhcWithInterpreter=NO is set in mk/build.mk build
    fails as:
    
        $ inplace/bin/dll-split compiler/stage2/build/.depend-v-dyn.haskell "DynFlags" ...
        Reachable modules from DynFlags out of date
        Please fix compiler/ghc.mk, or building DLLs on Windows may break (#7780)
        Extra modules: ByteCodeTypes InteractiveEvalTypes
    
    Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>


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

03e34256e2cba964adf6dcdb1682618f26400b3a
 compiler/ghc.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 28b0001..d5498c4 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -441,6 +441,7 @@ compiler_stage2_dll0_MODULES = \
 	BinFingerprint \
 	BooleanFormula \
 	BufWrite \
+	ByteCodeTypes \
 	Class \
 	CmdLineParser \
 	CmmType \
@@ -494,12 +495,13 @@ compiler_stage2_dll0_MODULES = \
 	HsUtils \
 	HscTypes \
 	IOEnv \
-  NameCache \
+	NameCache \
 	Id \
 	IdInfo \
 	IfaceSyn \
 	IfaceType \
-	Json 		\
+	InteractiveEvalTypes \
+	Json \
 	ToIface \
 	InstEnv \
 	Kind \
@@ -564,9 +566,7 @@ compiler_stage2_dll0_MODULES = \
 ifeq "$(GhcWithInterpreter)" "YES"
 # These files are reacheable from DynFlags
 # only by GHCi-enabled code (see #9552)
-compiler_stage2_dll0_MODULES += \
-	ByteCodeTypes \
-	InteractiveEvalTypes
+compiler_stage2_dll0_MODULES += # none
 endif
 
 compiler_stage2_dll0_HS_OBJS = \



More information about the ghc-commits mailing list