[commit: ghc] ghc-7.4: Get correct options when calling 'clang' inplace of 'as' (#5903) (bae5f61)

[David Terei]

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

On branch  : ghc-7.4

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

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

commit bae5f61ec36d469f46cfcd6239f6bb18b10ad515
Author: David Terei <davidterei at gmail.com>
Date:   Sun Mar 4 23:53:37 2012 -0500

    Get correct options when calling 'clang' inplace of 'as' (#5903)
    
    MERGED from commit 5e383469a9cb1fc17af3882f6217e5382a80fc67

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

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

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 353a778..9de71ba 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1183,14 +1183,17 @@ runPhase As input_fn dflags
                         = do
                             llvmVer <- io $ figureLlvmVersion dflags
                             return $ case llvmVer of
-                                Just n | n >= 30 -> SysTools.runClang
-                                _                -> SysTools.runAs
+                                -- using cGccLinkerOpts here but not clear if
+                                -- opt_c isn't a better choice
+                                Just n | n >= 30 ->
+                                    (SysTools.runClang, cGccLinkerOpts)
+
+                                _ -> (SysTools.runAs, getOpts dflags opt_a)
 
                         | otherwise
-                        = return SysTools.runAs
+                        = return (SysTools.runAs, getOpts dflags opt_a)
 
-        as_prog <- whichAsProg
-        let as_opts = getOpts dflags opt_a
+        (as_prog, as_opts) <- whichAsProg
         let cmdline_include_paths = includePaths dflags
 
         next_phase <- maybeMergeStub