From 0dded5ecd2f02e13292818ae3729d32832c014f3 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 11 Jul 2019 18:42:35 -0400 Subject: Always enable the external interpreter You can always just not use or even build `iserv`. I don't think the maintenance cost of the CPP is worth...I can't even tell what the benefit is. --- hadrian/src/Settings/Packages.hs | 4 ---- 1 file changed, 4 deletions(-) (limited to 'hadrian/src/Settings/Packages.hs') diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs index 98fe8a2e24..20bd114480 100644 --- a/hadrian/src/Settings/Packages.hs +++ b/hadrian/src/Settings/Packages.hs @@ -79,7 +79,6 @@ packageArgs = do , builder (Cabal Flags) ? mconcat [ ghcWithNativeCodeGen ? arg "ncg" , ghcWithInterpreter ? notStage0 ? arg "ghci" - , notStage0 ? not windowsHost ? notM cross ? arg "ext-interp" , cross ? arg "-terminfo" , notStage0 ? intLib == integerGmp ? arg "integer-gmp" @@ -94,7 +93,6 @@ packageArgs = do , builder (Cabal Flags) ? mconcat [ ghcWithInterpreter ? notStage0 ? arg "ghci" - , notStage0 ? not windowsHost ? notM cross ? arg "ext-interp" , cross ? arg "-terminfo" -- the 'threaded' flag is True by default, but -- let's record explicitly that we link all ghc @@ -128,8 +126,6 @@ packageArgs = do -- behind the @-fghci@ flag. , package ghci ? mconcat [ notStage0 ? builder (Cabal Flags) ? arg "ghci" - , notStage0 ? builder (Cabal Flags) ? not windowsHost ? notM cross - ? arg "ext-interp" , cross ? stage0 ? builder (Cabal Flags) ? arg "ghci" ] -------------------------------- haddock ------------------------------- -- cgit v1.2.1