Fix passing of include dirs to GHCI #1222

commercialhaskell · Oct 28, 2015 · 5883193 · 5883193
1 parent c102b5b
commit 5883193
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
@@ -328,9 +328,12 @@ 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)
-            (cabalDir :
+            ((if null (hsSourceDirs b) then [cabalDir] else []) <>
              map (cabalDir </>) (mapMaybe parseRelDir (hsSourceDirs b)) <>
              [autogenDir distDir,buildDir distDir]) ++
         ["-stubdir=" ++ toFilePath (buildDir distDir)]