diff options
| -rw-r--r-- | compiler/ghc.mk | 5 | ||||
| -rw-r--r-- | hadrian/src/Settings/Packages.hs | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 05a6d9def1..92a844c779 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -200,11 +200,6 @@ ifeq "$(GhcThreadedRts)" "YES" compiler_stage1_CONFIGURE_OPTS += --ghc-option=-optc-DTHREADED_RTS endif -ifeq "$(GhcWithNativeCodeGen)" "YES" -compiler_stage1_CONFIGURE_OPTS += --flags=ncg -compiler_stage2_CONFIGURE_OPTS += --flags=ncg -endif - ifeq "$(GhcWithInterpreter)" "YES" compiler_stage2_CONFIGURE_OPTS += --flags=ghci diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs index 42e95f6664..cdf5a51d8d 100644 --- a/hadrian/src/Settings/Packages.hs +++ b/hadrian/src/Settings/Packages.hs @@ -73,8 +73,7 @@ packageArgs = do notStage0 ? arg "--ghc-pkg-option=--force" ] , builder (Cabal Flags) ? mconcat - [ ghcWithNativeCodeGen ? arg "ncg" - , ghcWithInterpreter ? notStage0 ? arg "ghci" + [ ghcWithInterpreter ? notStage0 ? arg "ghci" , cross ? arg "-terminfo" ] |