projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of the last remnants of PROJECT_DIR
[ghc-hetmet.git]
/
compiler
/
main
/
SysTools.lhs
diff --git
a/compiler/main/SysTools.lhs
b/compiler/main/SysTools.lhs
index
97a5ea7
..
934755d
100644
(file)
--- a/
compiler/main/SysTools.lhs
+++ b/
compiler/main/SysTools.lhs
@@
-167,13
+167,7
@@
initSysTools mbMinusB dflags
; let installed, installed_bin :: FilePath -> FilePath
installed_bin pgm = top_dir </> pgm
installed file = top_dir </> file
; let installed, installed_bin :: FilePath -> FilePath
installed_bin pgm = top_dir </> pgm
installed file = top_dir </> file
- inplace dir pgm = top_dir </>
-#ifndef darwin_TARGET_OS
--- Not sure where cPROJECT_DIR makes sense, on Mac OS, building with
--- xcodebuild, it surely is a *bad* idea! -=chak
- cPROJECT_DIR </>
-#endif
- dir </> pgm
+ inplace dir pgm = top_dir </> dir </> pgm
; let pkgconfig_path
| am_installed = installed "package.conf"
; let pkgconfig_path
| am_installed = installed "package.conf"
@@
-619,7
+613,7
@@
getTempDir dflags@(DynFlags{tmpDir=tmp_dir})
in do createDirectory dirname
let mapping' = addToFM mapping tmp_dir dirname
writeIORef v_DirsToClean mapping'
in do createDirectory dirname
let mapping' = addToFM mapping tmp_dir dirname
writeIORef v_DirsToClean mapping'
- debugTraceMsg dflags 2 (ptext SLIT("Created temporary directory:") <+> text dirname)
+ debugTraceMsg dflags 2 (ptext (sLit "Created temporary directory:") <+> text dirname)
return dirname
`IO.catch` \e ->
if isAlreadyExistsError e
return dirname
`IO.catch` \e ->
if isAlreadyExistsError e
@@
-663,8
+657,8
@@
removeWith :: DynFlags -> (FilePath -> IO ()) -> FilePath -> IO ()
removeWith dflags remover f = remover f `IO.catch`
(\e ->
let msg = if isDoesNotExistError e
removeWith dflags remover f = remover f `IO.catch`
(\e ->
let msg = if isDoesNotExistError e
- then ptext SLIT("Warning: deleting non-existent") <+> text f
- else ptext SLIT("Warning: exception raised when deleting")
+ then ptext (sLit "Warning: deleting non-existent") <+> text f
+ else ptext (sLit "Warning: exception raised when deleting")
<+> text f <> colon
$$ text (show e)
in debugTraceMsg dflags 2 msg
<+> text f <> colon
$$ text (show e)
in debugTraceMsg dflags 2 msg
@@
-858,7
+852,7
@@
traceCmd dflags phase_name cmd_line action
}}
where
handle_exn verb exn = do { debugTraceMsg dflags 2 (char '\n')
}}
where
handle_exn verb exn = do { debugTraceMsg dflags 2 (char '\n')
- ; debugTraceMsg dflags 2 (ptext SLIT("Failed:") <+> text cmd_line <+> text (show exn))
+ ; debugTraceMsg dflags 2 (ptext (sLit "Failed:") <+> text cmd_line <+> text (show exn))
; throwDyn (PhaseFailed phase_name (ExitFailure 1)) }
\end{code}
; throwDyn (PhaseFailed phase_name (ExitFailure 1)) }
\end{code}