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

hadrian: disable internal-interpreter of ghc library when cross compiling

This commit disable the internal-interpreter flag of ghc library when
cross compiling, only external interpreter works in such cases.

(cherry picked from commit f232c872)
(cherry picked from commit 4e7d0cee)
parent 8f5d1b68
No related branches found
No related tags found
No related merge requests found
...@@ -73,7 +73,15 @@ packageArgs = do ...@@ -73,7 +73,15 @@ packageArgs = do
, compilerStageOption ghcProfiled ? arg "--ghc-pkg-option=--force" ] , compilerStageOption ghcProfiled ? arg "--ghc-pkg-option=--force" ]
, builder (Cabal Flags) ? mconcat , builder (Cabal Flags) ? mconcat
[ andM [expr ghcWithInterpreter, notStage0] `cabalFlag` "internal-interpreter" -- For the ghc library, internal-interpreter only makes
-- sense when we're not cross compiling. For cross GHC,
-- external interpreter is used for loading target code
-- and internal interpreter is supposed to load native
-- code for plugins (!7377), however it's unfinished work
-- (#14335) and completely untested in CI for cross
-- backends at the moment, so we might as well disable it
-- for cross GHC.
[ andM [expr ghcWithInterpreter, notStage0, notCross] `cabalFlag` "internal-interpreter"
, notM cross `cabalFlag` "terminfo" , notM cross `cabalFlag` "terminfo"
, arg "-build-tool-depends" , arg "-build-tool-depends"
, flag UseLibzstd `cabalFlag` "with-libzstd" , flag UseLibzstd `cabalFlag` "with-libzstd"
......
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