From 1560a7c16c72db55a06e7f6b3958f9257fb90b94 Mon Sep 17 00:00:00 2001 From: Ian Lynagh <igloo@earth.li> Date: Sun, 11 May 2008 18:13:05 +0000 Subject: [PATCH] Remove a hardcoded "dist" --- Distribution/Simple/Program.hs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Distribution/Simple/Program.hs b/Distribution/Simple/Program.hs index 3f0412a1b3..a2400fe411 100644 --- a/Distribution/Simple/Program.hs +++ b/Distribution/Simple/Program.hs @@ -92,7 +92,8 @@ import Distribution.Version import Distribution.Text ( simpleParse, display ) import Distribution.Verbosity -import System.Directory (doesFileExist, removeFile, findExecutable) +import System.Directory (doesFileExist, removeFile, findExecutable, + getTemporaryDirectory) import System.FilePath (dropExtension) import System.IO (hClose) import System.IO.Error (try) @@ -579,8 +580,9 @@ hsc2hsProgram = (simpleProgram "hsc2hs") { -- to see if it was indeed ghc or not. case maybeVersion of Nothing -> return Nothing - Just version -> - withTempFile "dist" ".hsc" $ \hsc hnd -> do + Just version -> do + tempDir <- getTemporaryDirectory + withTempFile tempDir ".hsc" $ \hsc hnd -> do hClose hnd (str, _) <- rawSystemStdout' verbosity path [hsc, "--cflag=--version"] try $ removeFile (dropExtension hsc ++ "_hsc_make.c") -- GitLab