aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Waern <david.waern@gmail.com>2008-12-07 20:58:05 +0000
committerDavid Waern <david.waern@gmail.com>2008-12-07 20:58:05 +0000
commit6301bdc16b239f1a83fa31d774c73386ebf1b4a2 (patch)
tree5ae749ffdb315d404b78fe0a042390149afdd9cb
parentf72f20ba5b3444e06b42b56e02725e81568b8033 (diff)
Resolve conflict properly
-rw-r--r--src/Haddock/GHC.hs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Haddock/GHC.hs b/src/Haddock/GHC.hs
index 597a6005..0d047080 100644
--- a/src/Haddock/GHC.hs
+++ b/src/Haddock/GHC.hs
@@ -47,6 +47,7 @@ startGhc libDir flags = do
#endif
let dynflags' = dopt_set dynflags Opt_Haddock
let dynflags'' = dynflags' {
+ hscTarget = HscNothing,
ghcMode = CompManager,
ghcLink = NoLink
}