[commit: ghc] ghc-7.8: Fix up b84748121e777d (fd4169f)

git at git.haskell.org git at git.haskell.org
Mon Jun 23 06:53:25 UTC 2014


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

On branch  : ghc-7.8
Link       : http://ghc.haskell.org/trac/ghc/changeset/fd4169f9caf6922e3e5ea9c31f497f7220fc62b8/ghc

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

commit fd4169f9caf6922e3e5ea9c31f497f7220fc62b8
Author: Austin Seipp <austin at well-typed.com>
Date:   Mon Jun 23 01:31:15 2014 -0500

    Fix up b84748121e777d
    
    I forgot to amend this to my last commit.
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>
    (cherry picked from commit 95f95ed6281adf9616d87b97470d68fb54c0b7f3)


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

fd4169f9caf6922e3e5ea9c31f497f7220fc62b8
 compiler/main/DriverPipeline.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 299422d..d2d2bc0 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1231,7 +1231,7 @@ runPhase (RealPhase (As with_cpp)) input_fn dflags
                        ++ (if platformArch (targetPlatform dflags) == ArchSPARC
                            then [SysTools.Option "-mcpu=v9"]
                            else [])
-                       ++ (if ccInfo == AppleClang51
+                       ++ (if any (ccInfo ==) [Clang, AppleClang, AppleClang51]
                             then [SysTools.Option "-Qunused-arguments"]
                             else [])
                        ++ [ SysTools.Option "-x"



More information about the ghc-commits mailing list