From: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Date: Wed, 1 Apr 2015 11:35:10 +0000 (+0000)
Subject: cabal-bug-1087
X-Git-Tag: archive/raspbian/8.0.2-9+rpi1~1^2^2^2^2^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=923509f593d82edf1eb3ef7fc7a92887f13f0a96;p=ghc.git

cabal-bug-1087

 Preprocessed files would be written to dist/build instead of
 dist/build/my-test-suite/my-test-suite-tmp, causing them not to be
 found during compilation.

 Fixes #1087.
Author: Johan Tibell <johan.tibell@gmail.com>
Origin: https://github.com/haskell/cabal/commit/dd691fa6791d67981388ec044b28343879d8c2b1

Gbp-Pq: Name cabal-bug-1087.patch
---

diff --git a/libraries/Cabal/Cabal/Distribution/Simple/PreProcess.hs b/libraries/Cabal/Cabal/Distribution/Simple/PreProcess.hs
index 0c6cb3e6..ad9df9f9 100644
--- a/libraries/Cabal/Cabal/Distribution/Simple/PreProcess.hs
+++ b/libraries/Cabal/Cabal/Distribution/Simple/PreProcess.hs
@@ -232,7 +232,7 @@ preprocessComponent pd comp lbi isSrcDist verbosity handlers = case comp of
     preProcessComponent bi modules exePath dir = do
         let biHandlers = localHandlers bi
             sourceDirs = hsSourceDirs bi ++ [ autogenModulesDir lbi ]
-        sequence_ [ preprocessFile sourceDirs (buildDir lbi) isSrcDist
+        sequence_ [ preprocessFile sourceDirs dir isSrcDist
                 (ModuleName.toFilePath modu) verbosity builtinSuffixes
                 biHandlers
                 | modu <- modules ]