Skip to content
Snippets Groups Projects
Commit da57d3a0 authored by Cheng Shao's avatar Cheng Shao
Browse files

hadrian: make sure ghc-bin internal-interpreter is disabled for stage0 when not cross compiling

This patch disables internal-interpreter flag for stage0 ghc-bin when
not cross compiling, see added comment for explanation. Fixes #25406.

(cherry picked from commit fde12aba)
parent c65c7ef4
No related branches found
No related tags found
No related merge requests found
......@@ -107,7 +107,16 @@ packageArgs = do
, compilerStageOption ghcDebugAssertions ? arg "-DDEBUG" ]
, builder (Cabal Flags) ? mconcat
[ expr ghcWithInterpreter `cabalFlag` "internal-interpreter"
[
-- When cross compiling, enable for stage0 to get ghci
-- support. But when not cross compiling, disable for
-- stage0, otherwise we introduce extra dependencies
-- like haskeline etc, and mixing stageBoot/stage0 libs
-- can cause extra trouble (e.g. #25406)
expr ghcWithInterpreter ?
ifM (expr cross)
(arg "internal-interpreter")
(notStage0 `cabalFlag` "internal-interpreter")
, ifM stage0
-- We build a threaded stage 1 if the bootstrapping compiler
-- supports it.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment