X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMain.hs;h=840f84341d53df486973c668a0f1eb1b125acedd;hb=39271273d6b1fd2cdfe92be1fa30a7eec3cc9107;hp=a2c2fd1a529218f37a16109237e2712d56667c90;hpb=aa9a4f1053d3c554629a2ec25955e7530c95b892;p=ghc-hetmet.git

diff --git a/ghc/Main.hs b/ghc/Main.hs
index a2c2fd1..840f843 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -125,9 +125,16 @@ main =
 				 	 _other   -> 1
 			}
 
+      -- turn on -fimplicit-import-qualified for GHCi now, so that it
+      -- can be overriden from the command-line
+      dflags1a | DoInteractive <- cli_mode = imp_qual_enabled
+               | DoEval _      <- cli_mode = imp_qual_enabled
+               | otherwise                 = dflags1
+        where imp_qual_enabled = dflags1 `dopt_set` Opt_ImplicitImportQualified
+
 	-- The rest of the arguments are "dynamic"
 	-- Leftover ones are presumably files
-  (dflags2, fileish_args, dynamicFlagWarnings) <- GHC.parseDynamicFlags dflags1 argv3
+  (dflags2, fileish_args, dynamicFlagWarnings) <- GHC.parseDynamicFlags dflags1a argv3
 
   let flagWarnings = staticFlagWarnings
                   ++ modeFlagWarnings