From b8cec66ec0e0935435103290b9a54b3c92aa71ba Mon Sep 17 00:00:00 2001 From: Cheng Shao <terrorjack@type.dance> Date: Thu, 3 Oct 2024 16:44:26 +0000 Subject: [PATCH] hadrian: enable internal-interpreter for ghc-bin stage0 This commit enables internal-interpreter flag for ghc-bin even when compiling stage0, as long as target supports ghci. It enables ghci functionality for cross targets that support ghci, since cross ghc-bin is really stage0. (cherry picked from commit 577c1819ab4eb3369cafdaf24114b74da21ce4b4) --- hadrian/src/Settings/Packages.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs index 0e4ccb6af0d..931e92c490a 100644 --- a/hadrian/src/Settings/Packages.hs +++ b/hadrian/src/Settings/Packages.hs @@ -107,7 +107,7 @@ packageArgs = do , compilerStageOption ghcDebugAssertions ? arg "-DDEBUG" ] , builder (Cabal Flags) ? mconcat - [ andM [expr ghcWithInterpreter, notStage0] `cabalFlag` "internal-interpreter" + [ expr ghcWithInterpreter `cabalFlag` "internal-interpreter" , ifM stage0 -- We build a threaded stage 1 if the bootstrapping compiler -- supports it. -- GitLab