Duncan Coutts pushed to branch wip/dcoutts/windows-dlls at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • compiler/GHC/Driver/Session.hs
    ... ... @@ -3588,7 +3588,7 @@ compilerInfo dflags
    3588 3588
            ("target has RTS linker",       showBool $ platformHasRTSLinker platform),
    
    3589 3589
            ("Target default backend",      show     $ platformDefaultBackend platform),
    
    3590 3590
            -- Whether or not we support @-dynamic-too@
    
    3591
    -       ("Support dynamic-too",         showBool $ not isWindows),
    
    3591
    +       ("Support dynamic-too",         "YES"),
    
    3592 3592
            -- Whether or not we support the @-j@ flag with @--make@.
    
    3593 3593
            ("Support parallel --make",     "YES"),
    
    3594 3594
            -- Whether or not we support "Foo from foo-0.1-XXX:Foo" syntax in
    
    ... ... @@ -3623,7 +3623,6 @@ compilerInfo dflags
    3623 3623
         showBool True  = "YES"
    
    3624 3624
         showBool False = "NO"
    
    3625 3625
         platform  = targetPlatform dflags
    
    3626
    -    isWindows = platformOS platform == OSMinGW32
    
    3627 3626
         expandDirectories = expandToolDir (toolDir dflags) . expandTopDir (topDir dflags)
    
    3628 3627
         query :: (Target -> a) -> a
    
    3629 3628
         query f = f (rawTarget dflags)
    
    ... ... @@ -3712,11 +3711,6 @@ makeDynFlagsConsistent :: DynFlags -> (DynFlags, [Warn], [Located SDoc])
    3712 3711
     -- ensure that a later change doesn't invalidate an earlier check.
    
    3713 3712
     -- Be careful not to introduce potential loops!
    
    3714 3713
     makeDynFlagsConsistent dflags
    
    3715
    - -- Disable -dynamic-too on Windows (#8228, #7134, #5987)
    
    3716
    - | os == OSMinGW32 && gopt Opt_BuildDynamicToo dflags
    
    3717
    -    = let dflags' = gopt_unset dflags Opt_BuildDynamicToo
    
    3718
    -          warn    = "-dynamic-too is not supported on Windows"
    
    3719
    -      in loop dflags' warn
    
    3720 3714
      -- Disable -dynamic-too if we are are compiling with -dynamic already, otherwise
    
    3721 3715
      -- you get two dynamic object files (.o and .dyn_o). (#20436)
    
    3722 3716
      | ways dflags `hasWay` WayDyn && gopt Opt_BuildDynamicToo dflags