[commit: ghc] master: Allow -fllvm to be used when compiling unregisterised (#7622) (388e1e8)

[Simon Marlow]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/388e1e825f79f2d16536fc583a48e5ce9c191b06

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

commit 388e1e825f79f2d16536fc583a48e5ce9c191b06
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Fri Jan 25 09:54:49 2013 +0000

    Allow -fllvm to be used when compiling unregisterised (#7622)

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

 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 e2f10c7..feadd3d 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -3376,7 +3376,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 /= HscC && hscTarget dflags /= HscLlvm &&
    platformUnregisterised (targetPlatform dflags)
     = loop (dflags { hscTarget = HscC })
            "Compiler unregisterised, so compiling via C"