Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : ghc-7.6

http://hackage.haskell.org/trac/ghc/changeset/715860aaeea0f2889953457fda8efa1765874dc0

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

commit 715860aaeea0f2889953457fda8efa1765874dc0
Author: Austin Seipp <[email protected]>
Date:   Sun Aug 5 03:26:45 2012 -0500

    Don't pass -Wimplicit to the C++ compiler.
    
    Supresses an ugly warning from gcc 4.6+ saying this is a C/ObjC flag
    only.
    
    Signed-off-by: Austin Seipp <[email protected]>
    
    MERGED from commit a0e308de485bdb275008a40de9c76c31230e6c51

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

 compiler/main/DriverPipeline.hs |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 4770679..d46cbc8 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1118,11 +1118,16 @@ runPhase cc_phase input_fn dflags
                            then ["-mcpu=v9"]
                            else [])
 
+                       -- GCC 4.6+ doesn't like -Wimplicit when compiling C++.
+                       ++ (if (cc_phase /= Ccpp && cc_phase /= Cobjcpp)
+                             then ["-Wimplicit"]
+                             else [])
+
                        ++ (if hcc
                              then gcc_extra_viac_flags ++ more_hcc_opts
                              else [])
                        ++ verbFlags
-                       ++ [ "-S", "-Wimplicit", cc_opt ]
+                       ++ [ "-S", cc_opt ]
                        ++ [ "-D__GLASGOW_HASKELL__="++cProjectVersionInt ]
                        ++ framework_paths
                        ++ cc_opts



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to