Commit 03e34256 authored by Sergei Trofimovich's avatar Sergei Trofimovich
Browse files

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: default avatarSergei Trofimovich <slyfox@gentoo.org>
parent f2b10f35
...@@ -441,6 +441,7 @@ compiler_stage2_dll0_MODULES = \ ...@@ -441,6 +441,7 @@ compiler_stage2_dll0_MODULES = \
BinFingerprint \ BinFingerprint \
BooleanFormula \ BooleanFormula \
BufWrite \ BufWrite \
ByteCodeTypes \
Class \ Class \
CmdLineParser \ CmdLineParser \
CmmType \ CmmType \
...@@ -494,12 +495,13 @@ compiler_stage2_dll0_MODULES = \ ...@@ -494,12 +495,13 @@ compiler_stage2_dll0_MODULES = \
HsUtils \ HsUtils \
HscTypes \ HscTypes \
IOEnv \ IOEnv \
NameCache \ NameCache \
Id \ Id \
IdInfo \ IdInfo \
IfaceSyn \ IfaceSyn \
IfaceType \ IfaceType \
Json \ InteractiveEvalTypes \
Json \
ToIface \ ToIface \
InstEnv \ InstEnv \
Kind \ Kind \
...@@ -564,9 +566,7 @@ compiler_stage2_dll0_MODULES = \ ...@@ -564,9 +566,7 @@ compiler_stage2_dll0_MODULES = \
ifeq "$(GhcWithInterpreter)" "YES" ifeq "$(GhcWithInterpreter)" "YES"
# These files are reacheable from DynFlags # These files are reacheable from DynFlags
# only by GHCi-enabled code (see #9552) # only by GHCi-enabled code (see #9552)
compiler_stage2_dll0_MODULES += \ compiler_stage2_dll0_MODULES += # none
ByteCodeTypes \
InteractiveEvalTypes
endif endif
compiler_stage2_dll0_HS_OBJS = \ compiler_stage2_dll0_HS_OBJS = \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment