From 109310d6143d55fdd8a08079db11df607c5c2a3a Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Sat, 17 Nov 2018 13:56:38 +0100
Subject: Fix compBuildDir isolation bug

In f071b83fd8 (Include source hash in helper binary output path) we accidentally
removed the GHC/Cabal version numbers previously included in this path.
---
 src/CabalHelper/Compiletime/Compile.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CabalHelper/Compiletime/Compile.hs b/src/CabalHelper/Compiletime/Compile.hs
index 8a07077..c1c3bc4 100644
--- a/src/CabalHelper/Compiletime/Compile.hs
+++ b/src/CabalHelper/Compiletime/Compile.hs
@@ -233,7 +233,7 @@ compPaths appdir cachedir c =
     case c of
       CompileWithCabalPackage {compProductTarget=CPSGlobal,..} -> CompPaths {..}
         where
-          compBuildDir = appdir </> sourceHash <.> "build"
+          compBuildDir = appdir </> exeName compCabalVersion ++ "--" ++ sourceHash <.> "build"
           compOutDir  = compBuildDir
           compExePath = compBuildDir </> "cabal-helper"
 
-- 
cgit v1.2.3