[commit: ghc] wip/kavon-nosplit-llvm: fix mistake in merge conflict (873074d)
git at git.haskell.org
git at git.haskell.org
Wed May 16 22:36:37 UTC 2018
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/kavon-nosplit-llvm
Link : http://ghc.haskell.org/trac/ghc/changeset/873074dbed6d0a467c1079fec0b8d3867ed0eed1/ghc
>---------------------------------------------------------------
commit 873074dbed6d0a467c1079fec0b8d3867ed0eed1
Author: Kavon Farvardin <kavon at farvard.in>
Date: Wed May 16 17:34:09 2018 -0500
fix mistake in merge conflict
>---------------------------------------------------------------
873074dbed6d0a467c1079fec0b8d3867ed0eed1
compiler/main/CodeOutput.hs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compiler/main/CodeOutput.hs b/compiler/main/CodeOutput.hs
index 1f2e62d..ac8b811 100644
--- a/compiler/main/CodeOutput.hs
+++ b/compiler/main/CodeOutput.hs
@@ -93,7 +93,7 @@ codeOutput dflags this_mod filenm location foreign_stubs foreign_fps pkg_deps
}
; stubs_exist <- outputForeignStubs dflags this_mod location foreign_stubs
- ; case hscTarget dflags of {
+ ; info <- case hscTarget dflags of {
HscAsm -> outputAsm dflags this_mod location filenm
linted_cmm_stream;
HscC -> outputC dflags filenm linted_cmm_stream pkg_deps;
More information about the ghc-commits
mailing list