summaryrefslogtreecommitdiff
path: root/compiler/main
diff options
context:
space:
mode:
authorKrzysztof Gogolewski <krzysztof.gogolewski@tweag.io>2018-11-22 14:46:27 -0500
committerBen Gamari <ben@smart-cactus.org>2018-11-22 16:08:47 -0500
commit8d008b71db53f7a59673f894f329b8d71f84c8ee (patch)
tree5980221e1cfec985b8ecfce70339f3d8b32ef9b8 /compiler/main
parentd2fbc33c4ff3074126ab71654af8bbf8a46e4e11 (diff)
downloadhaskell-8d008b71db53f7a59673f894f329b8d71f84c8ee.tar.gz
Don't pass -no-pie when -pgmc is supplied
Test Plan: validate Reviewers: bgamari Reviewed By: bgamari Subscribers: rwbarton, carter GHC Trac Issues: #15319 Differential Revision: https://phabricator.haskell.org/D5317
Diffstat (limited to 'compiler/main')
-rw-r--r--compiler/main/DynFlags.hs5
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 2b1992274b..654c347d3f 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -2935,7 +2935,10 @@ dynamic_flags_deps = [
, make_ord_flag defFlag "pgmF"
(hasArg (\f -> alterSettings (\s -> s { sPgm_F = f})))
, make_ord_flag defFlag "pgmc"
- (hasArg (\f -> alterSettings (\s -> s { sPgm_c = (f,[])})))
+ (hasArg (\f -> alterSettings (\s -> s { sPgm_c = (f,[]),
+ -- Don't pass -no-pie with -pgmc
+ -- (see Trac #15319)
+ sGccSupportsNoPie = False})))
, make_ord_flag defFlag "pgms"
(hasArg (\f -> alterSettings (\s -> s { sPgm_s = (f,[])})))
, make_ord_flag defFlag "pgma"