diff options
| author | David Terei <davidterei@gmail.com> | 2012-03-04 23:53:37 -0500 |
|---|---|---|
| committer | David Terei <davidterei@gmail.com> | 2012-03-06 03:16:34 -0800 |
| commit | 5e383469a9cb1fc17af3882f6217e5382a80fc67 (patch) | |
| tree | 78ea125b3cd1fbc5907b94f5ddc2b7a219e47bcb | |
| parent | 47a9a997bde96e99a4b112c70bf953987a220fd1 (diff) | |
| download | haskell-5e383469a9cb1fc17af3882f6217e5382a80fc67.tar.gz | |
Get correct options when calling 'clang' inplace of 'as' (#5903)
| -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 |