compiler/ghc.mk: fix GhcWithInterpreter=NO build failure
authorSergei Trofimovich <slyfox@gentoo.org>
Sun, 2 Apr 2017 13:01:19 +0000 (14:01 +0100)
committerSergei Trofimovich <slyfox@gentoo.org>
Sun, 2 Apr 2017 13:12:20 +0000 (14:12 +0100)
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@gentoo.org>
compiler/ghc.mk

index 28b0001..d5498c4 100644 (file)
@@ -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 = \