cleanup2

Author: Saizan

haskell-debugger/GHC/Debugger/Debuggee.hs

@@ -24,8 +24,6 @@ import Data.Function
 import Data.Functor.Contravariant
 import Data.Maybe
 import Prelude hiding (mod)
-#ifdef MIN_VERSION_unix
-#endif
 import Data.Text (Text)
 import Network.Socket hiding (Debug)
 import System.Process.Internals (mkProcessHandle)
@@ -112,7 +110,6 @@ mkExternalInterpreterFromStdInSetup :: StdStream -> LogAction IO DebuggerLog ->
 mkExternalInterpreterFromStdInSetup givenStdStream l dflags mainGhcThread = do
   unless (gopt Opt_ExternalInterpreter dflags) $ do
     throw $ InconsistentInterpreterFlags $ "Used ghc flag  -fno-external-interpreter instead of --internal-interpreter haskell-debugger flag."
-  let externalInterpreterProg = getPgmI dflags
 
   (putHandles,fwdThread) <- liftIO $ externalInterpFwdThread l
   -- Make sure to override the function which creates the external
@@ -131,8 +128,8 @@ mkExternalInterpreterFromStdInSetup givenStdStream l dflags mainGhcThread = do
 #if MIN_VERSION_ghc(9,15,0)
 #else
                 , cmdspec = case cmdspec cp of
-                    ShellCommand (words -> ws) -> ShellCommand $ unwords $ externalInterpreterProg : drop 1 ws
-                    RawCommand _fp args -> RawCommand externalInterpreterProg args
+                    ShellCommand (words -> ws) -> ShellCommand $ unwords $ getPgmI dflags : drop 1 ws
+                    RawCommand _fp args -> RawCommand (getPgmI dflags) args
 #endif
                 }
             putHandles (o, e)

haskell-debugger/GHC/Debugger/Monad.hs

@@ -76,9 +76,6 @@ import Colog.Core as Logger
 import {-# SOURCE #-} GHC.Debugger.Runtime.Instances.Discover (RuntimeInstancesCache, emptyRuntimeInstancesCache)
 import GHC.Stack.Annotation
 import GHC.Platform.Ways
-#if MIN_VERSION_ghc(9,15,0)
-import GHC.Data.FastString.Env (emptyFsEnv)
-#endif
 import GHC.Unit.Home.Graph
 import GHC.Debugger.Utils.Orphans () -- bring orphan instances to everything which uses `Debugger`
 import System.Directory (getCurrentDirectory)

test/golden/T130/T130.ghc-1001.hdb-stdout

@@ -1,2 +1 @@
 Cannot use unsupported haskell-debugger-view version found in the transitive closure: 0.1.0.0 (supported: 0.2 <= && < 0.3)
-While handling Cannot use unsupported haskell-debugger-view version found in the transitive closure: 0.1.0.0 (supported: 0.2 <= && < 0.3)