diff options
| author | Max Bolingbroke <batterseapower@hotmail.com> | 2012-03-07 17:28:21 +0000 |
|---|---|---|
| committer | Max Bolingbroke <batterseapower@hotmail.com> | 2012-03-07 17:28:21 +0000 |
| commit | 4f070dd16ee31f38aff931f4b7b0ce562dcb98f4 (patch) | |
| tree | dd41663f9b3fc6934e573c6f8ee2106db8259192 /compiler/main/DriverPipeline.hs | |
| parent | feeedb3ccf4977eb028924d072244237ff6e3984 (diff) | |
| parent | 28f783f1c367784e0adcac2447682061a38f2ba3 (diff) | |
| download | haskell-unboxed-tuple-arguments.tar.gz | |
Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc into unboxed-tuple-argumentsunboxed-tuple-arguments
Diffstat (limited to 'compiler/main/DriverPipeline.hs')
| -rw-r--r-- | 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 fab7600c01..488df37a79 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -1176,14 +1176,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 |