File tree 1 file changed +4
-3
lines changed
1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -106,8 +106,9 @@ ghci GhciOpts{..} = do
106
106
(" The following GHC options are incompatible with GHCi and have not been passed to it: " <>
107
107
T. unwords (map T. pack (nubOrd omittedOpts)))
108
108
let modulesToLoad = nubOrd $
109
- maybe [] (return . toFilePath) mainFile <>
110
109
concatMap (map display . S. toList . ghciPkgModules) pkgs
110
+ thingsToLoad =
111
+ maybe [] (return . toFilePath) mainFile <> modulesToLoad
111
112
odir =
112
113
[ " -odir=" <> toFilePathNoTrailingSep (objectInterfaceDir bconfig)
113
114
, " -hidir=" <> toFilePathNoTrailingSep (objectInterfaceDir bconfig)]
@@ -132,8 +133,8 @@ ghci GhciOpts{..} = do
132
133
(\ tmpDir ->
133
134
do let scriptPath = tmpDir </> $ (mkRelFile " ghci-script" )
134
135
fp = toFilePath scriptPath
135
- loadModules = " :load " <> unwords (map show modulesToLoad )
136
- bringIntoScope = " :module + " <> unwords ( map show modulesToLoad)
136
+ loadModules = " :load " <> unwords (map show thingsToLoad )
137
+ bringIntoScope = " :module + " <> unwords modulesToLoad
137
138
liftIO (writeFile fp (unlines [loadModules,bringIntoScope]))
138
139
finally (execGhci [" -ghci-script=" <> fp])
139
140
(removeFile scriptPath))
You can’t perform that action at this time.
0 commit comments