summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-06 15:18:13 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-06 15:18:13 -0400
commit9d05a5747dd0af7fa4720edc2bffc0acf948684c (patch)
tree0b97839d8226c91f78692f123d1142b27813e08a
parent594d28725e37abbd4c5fbd960c9f935d201ed78f (diff)
better output
-rw-r--r--Build/EvilLinker.hs3
1 files changed, 1 insertions, 2 deletions
diff --git a/Build/EvilLinker.hs b/Build/EvilLinker.hs
index a6889aa69..fab69e3c9 100644
--- a/Build/EvilLinker.hs
+++ b/Build/EvilLinker.hs
@@ -116,7 +116,7 @@ getOutput cmd params env = do
runParser' :: Parser a -> String -> a
runParser' p s = either failedparse id (parse p "" s)
where
- failedparse e = error $ (show e) ++ "\nInput:\n" ++ s
+ failedparse e = error $ (show e) ++ "\n<<<\n" ++ s ++ "\n>>>"
atFile :: FilePath -> String
atFile f = '@':f
@@ -135,7 +135,6 @@ main = do
["build", "--ghc-options=-v -keep-tmp-files"] Nothing
gccout <- fst <$> runAtFile parseGhcLink ghcout "gcc.opt" ["-v"]
collect2out <- fst <$> runAtFile parseGccLink gccout "collect2.opt" ["-v"]
- writeFile "collect2.out" collect2out
(out, ok) <- runAtFile parseCollect2 collect2out "ld.opt" []
unless ok $
error $ "ld failed:\n" ++ out