summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorBernhard Herzog <bernhard.herzog@intevation.de>2015-07-17 00:04:05 +0200
committerBen Gamari <ben@smart-cactus.org>2015-07-17 00:08:10 +0200
commit415351a938e86c4def60228552f121d91bbe7e59 (patch)
treea06a0daf37346c8659cd27c1621a5b01a06b7e75 /compiler
parentae96c751c869813ab95e712f8daac8516bb4795f (diff)
downloadhaskell-415351a938e86c4def60228552f121d91bbe7e59.tar.gz
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
Diffstat (limited to 'compiler')
-rw-r--r--compiler/main/DynFlags.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index ecc7bbd18f..70981e7557 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