Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Wed, 3 Oct 2012 15:10:16 +0000 (16:10 +0100)
committerIan Lynagh <ian@well-typed.com>
Wed, 3 Oct 2012 15:10:16 +0000 (16:10 +0100)
1  2 
compiler/main/DynFlags.hs

@@@ -2437,12 -2452,14 +2438,13 @@@ xFlags = 
    ( "OverlappingInstances",             Opt_OverlappingInstances, nop ),
    ( "UndecidableInstances",             Opt_UndecidableInstances, nop ),
    ( "IncoherentInstances",              Opt_IncoherentInstances, nop ),
-   ( "PackageImports",                   Opt_PackageImports, nop )
+   ( "PackageImports",                   Opt_PackageImports, nop ),
+   ( "TypeHoles",                        Opt_TypeHoles, nop )
    ]
  
 -defaultFlags :: Platform -> [DynFlag]
 -defaultFlags platform
 +defaultFlags :: Settings -> [DynFlag]
 +defaultFlags settings
    = [ Opt_AutoLinkPackages,
 -      Opt_Static,
  
        Opt_SharedImplib,