[commit: ghc] master: Put Opt_Static into defaultFlags if not pc_DYNAMIC_BY_DEFAULT (#7478) (415351a)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/415351a938e86c4def60228552f121d91bbe7e59/ghc

>---------------------------------------------------------------

commit 415351a938e86c4def60228552f121d91bbe7e59
Author: Bernhard Herzog <bernhard.herzog at intevation.de>
Date:   Fri Jul 17 00:04:05 2015 +0200

    Put Opt_Static into defaultFlags if not pc_DYNAMIC_BY_DEFAULT (#7478)
    
    The test for Trac issue #7478 fails on some systems due to
    inconsistent default flags for dynamic vs. static linking.
    
    Test Plan: validate
    
    Reviewers: austin, thomie
    
    Reviewed By: thomie
    
    Subscribers: thomie, bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1017
    
    GHC Trac Issues: #7478


>---------------------------------------------------------------

415351a938e86c4def60228552f121d91bbe7e59
 compiler/main/DynFlags.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index ecc7bbd..70981e7 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -3208,7 +3208,8 @@ defaultFlags settings
 
     ++ (if pc_DYNAMIC_BY_DEFAULT (sPlatformConstants settings)
         then wayGeneralFlags platform WayDyn
-        else [])
+        else [Opt_Static])
+        -- Opt_Static needs to be set if and only if WayDyn is not used (#7478)
 
     where platform = sTargetPlatform settings