From 6301bdc16b239f1a83fa31d774c73386ebf1b4a2 Mon Sep 17 00:00:00 2001
From: David Waern <david.waern@gmail.com>
Date: Sun, 7 Dec 2008 20:58:05 +0000
Subject: Resolve conflict properly

---
 src/Haddock/GHC.hs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Haddock')

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
       }
-- 
cgit v1.2.3