[Git][ghc/ghc][master] hadrian: make sure ghc-bin internal-interpreter is disabled for stage0 when not cross compiling

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
fde12aba by Cheng Shao at 2024-10-22T16:31:54-04:00
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.

- - - - -


1 changed file:

- hadrian/src/Settings/Packages.hs


Changes:

=====================================
hadrian/src/Settings/Packages.hs
=====================================
@@ -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.



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fde12aba9bb2d3ba607548dfba648f2a5ee00b59

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fde12aba9bb2d3ba607548dfba648f2a5ee00b59
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20241022/81956f75/attachment-0001.html>