Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/17f6f463844bbb7085b1bd9ab89436bfa93f8409 >--------------------------------------------------------------- commit 17f6f463844bbb7085b1bd9ab89436bfa93f8409 Author: Simon Marlow <[email protected]> Date: Fri Nov 11 10:48:33 2011 +0000 add comment noting when we can remove a hack >--------------------------------------------------------------- compiler/main/DriverPipeline.hs | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index 8037cfb..8c0f3a6 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -138,7 +138,8 @@ compile' (nothingCompiler, interactiveCompiler, batchCompiler) -- This is needed when we try to compile the .hc file later, if it -- imports a _stub.h file that we created here. let current_dir = case takeDirectory basename of - "" -> "." -- XXX Hack + "" -> "." -- XXX Hack required for filepath-1.1 and earlier + -- (GHC 6.12 and earlier) d -> d old_paths = includePaths dflags0 dflags = dflags0 { includePaths = current_dir : old_paths } @@ -839,8 +840,9 @@ runPhase (Hsc src_flavour) input_fn dflags0 -- the .hs files resides) to the include path, since this is -- what gcc does, and it's probably what you want. let current_dir = case takeDirectory basename of - "" -> "." -- XXX Hack - d -> d + "" -> "." -- XXX Hack required for filepath-1.1 and earlier + -- (GHC 6.12 and earlier) + d -> d paths = includePaths dflags0 dflags = dflags0 { includePaths = current_dir : paths } _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
