From 252dddbb76ff90bd502f485912f99d57aea55638 Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Mon, 10 Aug 2015 04:15:23 +0200 Subject: Fix exe output path --- CabalHelper/Main.hs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/CabalHelper/Main.hs b/CabalHelper/Main.hs index 754f356..39cab5d 100644 --- a/CabalHelper/Main.hs +++ b/CabalHelper/Main.hs @@ -351,16 +351,11 @@ componentEntrypoints (CBench Benchmark {}) = ChLibEntrypoint [] [] exeOutDir :: LocalBuildInfo -> String -> FilePath -exeOutDir lbi exeName = +exeOutDir lbi exeName' = ----- Copied from Distribution/Simple/GHC.hs:buildOrReplExe - -- exeNameReal, the name that GHC really uses (with .exe on Windows) - let exeNameReal = exeName <.> - (if takeExtension exeName /= ('.':exeExtension) - then exeExtension - else "") - - targetDir = (buildDir lbi) exeName - in targetDir + let targetDir = (buildDir lbi) exeName' + exeDir = targetDir (exeName' ++ "-tmp") + in exeDir removeInplaceDeps :: Verbosity -- cgit v1.2.3