diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2013-04-16 16:41:08 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2013-04-16 16:41:08 +0100 |
| commit | 717d4a2d5728a58c790457d71b53ca1cd57c086b (patch) | |
| tree | 429b4dd6e7ed27cef26e54e75328d0dceb22839f /compiler | |
| parent | 46e204f7e0dc08a84a64ecc2fdaa9e3abef8438f (diff) | |
| parent | b5ac19aa948864642de618367e09e3a751fff696 (diff) | |
| download | haskell-717d4a2d5728a58c790457d71b53ca1cd57c086b.tar.gz | |
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/main/DynFlags.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 24c573b366..6ddf2145cb 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -3409,7 +3409,7 @@ makeDynFlagsConsistent dflags else let dflags' = dflags { hscTarget = HscLlvm } warn = "Compiler not unregisterised, so using LLVM rather than compiling via C" in loop dflags' warn - | hscTarget dflags /= HscC && hscTarget dflags /= HscLlvm && + | hscTarget dflags == HscAsm && platformUnregisterised (targetPlatform dflags) = loop (dflags { hscTarget = HscC }) "Compiler unregisterised, so compiling via C" |