diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-03-19 00:41:22 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-19 00:41:22 +0000 |
| commit | ba2c7535a8461be8ce72ccdd4c34173568787491 (patch) | |
| tree | b8533abf52ea7a1c6dd2475e53401fa74dda1a3c /compiler/main | |
| parent | effdd65a4a6a54acb93ca592436fed1571f70559 (diff) | |
| parent | be956c210bfe6f2a2917d4cb6951ba6a9e6cc318 (diff) | |
| download | haskell-ba2c7535a8461be8ce72ccdd4c34173568787491.tar.gz | |
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/DynFlags.hs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 17484e0ddd..ecf6acbb15 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -3407,6 +3407,7 @@ makeDynFlagsConsistent dflags in loop dflags' warn | hscTarget dflags == HscLlvm && not ((arch == ArchX86_64) && (os == OSLinux || os == OSDarwin)) && + not ((isARM arch) && (os == OSLinux)) && (not (gopt Opt_Static dflags) || gopt Opt_PIC dflags) = if cGhcWithNativeCodeGen == "YES" then let dflags' = dflags { hscTarget = HscAsm } |