Commit 0c047a83 authored by Ian Lynagh's avatar Ian Lynagh

Remove an old hack for bad FilePath behaviour

We now require GHC >= 7.0, which has the behaviour we want.
parent c1a30d7f
...@@ -137,10 +137,7 @@ compile' (nothingCompiler, interactiveCompiler, batchCompiler) ...@@ -137,10 +137,7 @@ compile' (nothingCompiler, interactiveCompiler, batchCompiler)
-- We add the directory in which the .hs files resides) to the import path. -- We add the directory in which the .hs files resides) to the import path.
-- This is needed when we try to compile the .hc file later, if it -- This is needed when we try to compile the .hc file later, if it
-- imports a _stub.h file that we created here. -- imports a _stub.h file that we created here.
let current_dir = case takeDirectory basename of let current_dir = takeDirectory basename
"" -> "." -- XXX Hack required for filepath-1.1 and earlier
-- (GHC 6.12 and earlier)
d -> d
old_paths = includePaths dflags0 old_paths = includePaths dflags0
dflags = dflags0 { includePaths = current_dir : old_paths } dflags = dflags0 { includePaths = current_dir : old_paths }
hsc_env = hsc_env0 {hsc_dflags = dflags} hsc_env = hsc_env0 {hsc_dflags = dflags}
...@@ -849,11 +846,7 @@ runPhase (Hsc src_flavour) input_fn dflags0 ...@@ -849,11 +846,7 @@ runPhase (Hsc src_flavour) input_fn dflags0
-- we add the current directory (i.e. the directory in which -- we add the current directory (i.e. the directory in which
-- the .hs files resides) to the include path, since this is -- the .hs files resides) to the include path, since this is
-- what gcc does, and it's probably what you want. -- what gcc does, and it's probably what you want.
let current_dir = case takeDirectory basename of let current_dir = takeDirectory basename
"" -> "." -- XXX Hack required for filepath-1.1 and earlier
-- (GHC 6.12 and earlier)
d -> d
paths = includePaths dflags0 paths = includePaths dflags0
dflags = dflags0 { includePaths = current_dir : paths } dflags = dflags0 { includePaths = current_dir : paths }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment