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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/eec4c10819ac1402555570c00688b39da136313e

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

commit eec4c10819ac1402555570c00688b39da136313e
Author: Erik de Castro Lopo <er...@mega-nerd.com>
Date:   Sun Dec 16 04:22:17 2012 +1100

    Call gcc with '-x assembler-with-cpp' instead of '-x assembler'.
    
    On x86 and powerpc, the second form above was ignoring all the CPP
    lines and hence trying to compile x86 asm on powerpc and powerpc asm
    on x86.

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

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

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index a216370..849532d 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1241,7 +1241,7 @@ runPhase As input_fn dflags
                            then [SysTools.Option "-mcpu=v9"]
                            else [])
 
-                       ++ [ SysTools.Option "-x", SysTools.Option "assembler"
+                       ++ [ SysTools.Option "-x", SysTools.Option 
"assembler-with-cpp"
                           , SysTools.Option "-c"
                           , SysTools.FileOption "" inputFilename
                           , SysTools.Option "-o"



_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@haskell.org
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to