[commit: ghc] master: Don't pass -no-pie when -pgmc is supplied (8d008b7)

git at git.haskell.org git at git.haskell.org
Thu Nov 22 21:09:30 UTC 2018


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8d008b71db53f7a59673f894f329b8d71f84c8ee/ghc

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

commit 8d008b71db53f7a59673f894f329b8d71f84c8ee
Author: Krzysztof Gogolewski <krzysztof.gogolewski at tweag.io>
Date:   Thu Nov 22 14:46:27 2018 -0500

    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


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

8d008b71db53f7a59673f894f329b8d71f84c8ee
 compiler/main/DynFlags.hs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 2b19922..654c347 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"



More information about the ghc-commits mailing list