| ... |
... |
@@ -88,12 +88,11 @@ packageArgs = do |
|
88
|
88
|
-- 1. ghcWithInterpreter must be True ("Use interpreter" =
|
|
89
|
89
|
-- "YES")
|
|
90
|
90
|
-- 2. For non-cross case it can be enabled
|
|
91
|
|
- -- 3. For cross case, disable for stage0 since that runs
|
|
92
|
|
- -- on the host and must rely on external interpreter to
|
|
93
|
|
- -- load target code, otherwise enable for stage1 since
|
|
94
|
|
- -- that runs on the target and can use target's own
|
|
95
|
|
- -- ghci object linker
|
|
96
|
|
- [ andM [expr (ghcWithInterpreter stage), orM [expr (notM cross), stage1, stage2]] `cabalFlag` "internal-interpreter"
|
|
|
91
|
+ -- 3. For cross case, disable for stage0 and stage1 since these run
|
|
|
92
|
+ -- on the host and must rely on external interpreter to load
|
|
|
93
|
+ -- target code, otherwise enable for stage2 since that runs on
|
|
|
94
|
+ -- the target and can use target's own ghci object linker
|
|
|
95
|
+ [ andM [expr (ghcWithInterpreter stage), orM [expr (notM cross), stage2]] `cabalFlag` "internal-interpreter"
|
|
97
|
96
|
, orM [ notM cross, haveCurses ] `cabalFlag` "terminfo"
|
|
98
|
97
|
, arg "-build-tool-depends"
|
|
99
|
98
|
, staged (buildFlag UseLibzstd) `cabalFlag` "with-libzstd"
|
| ... |
... |
@@ -115,7 +114,7 @@ packageArgs = do |
|
115
|
114
|
, compilerStageOption ghcDebugAssertions ? arg "-DDEBUG" ]
|
|
116
|
115
|
|
|
117
|
116
|
, builder (Cabal Flags) ? mconcat
|
|
118
|
|
- [ (expr (ghcWithInterpreter stage)) `cabalFlag` "internal-interpreter"
|
|
|
117
|
+ [ andM [expr (ghcWithInterpreter stage), orM [expr (notM cross), stage1]] `cabalFlag` "internal-interpreter"
|
|
119
|
118
|
, ifM stage0
|
|
120
|
119
|
-- We build a threaded stage 1 if the bootstrapping compiler
|
|
121
|
120
|
-- supports it.
|