Only reset GHCI include paths once

commercialhaskell · Nov 2, 2015 · 1bf5156 · 1bf5156
1 parent 31779a1
commit 1bf5156
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Stack/Ghci.hs b/src/Stack/Ghci.hs
@@ -103,6 +103,9 @@ ghci GhciOpts{..} = do
                               defaultEnvSettings
                               (fromMaybe (compilerExeName wc) ghciGhcCommand)
                               ("--interactive" :
+                              -- This initial "-i" resets the include directories to not
+                              -- include CWD.
+                               "-i" :
                                odir <> pkgopts <> ghciArgs <>
                                ["-ghci-script=" <> fp]))
                          (removeFile scriptPath))

diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
@@ -328,9 +328,6 @@ generateBuildInfoOpts sourceMap installedMap mcabalmacros cabalDir distDir omitP
         isGhc _ = False
     extOpts = map (("-X" ++) . display) . usedExtensions
     srcOpts =
-        -- This initial "-i" resets the include directories to not
-        -- include CWD.
-        "-i" :
         map
             (("-i" <>) . toFilePath)
             ((if null (hsSourceDirs b) then [cabalDir] else []) <>