Only Custom setup scripts should be compiled with '-i -i.'.

See #3003 (comment).
haskell · Jan 30, 2016 · b453d30 · b453d30
1 parent da8caf4
commit b453d30
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/cabal-install/Distribution/Client/SetupWrapper.hs b/cabal-install/Distribution/Client/SetupWrapper.hs
@@ -568,7 +568,9 @@ externalSetupMethod verbosity options pkg bt mkargs = do
             , ghcOptObjDir          = Flag setupDir
             , ghcOptHiDir           = Flag setupDir
             , ghcOptSourcePathClear = Flag True
-            , ghcOptSourcePath      = toNubListR [workingDir]
+            , ghcOptSourcePath      = case bt of
+                                      Custom -> toNubListR [workingDir]
+                                      _      -> mempty
             , ghcOptPackageDBs      = usePackageDB options''
             , ghcOptHideAllPackages = Flag newPedanticDeps
             , ghcOptCabal           = Flag newPedanticDeps