mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

propigate ld failure

Browse source
This commit is contained in:
Joey Hess 2013-12-06 14:29:58 -04:00
parent b97fe204ba
commit 3b3276988c
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Build/EvilLinker.hs
View file

@ -105,13 +105,10 @@ escapeDosPaths = replace "Program Files" "Program\\ Files"
restOfLine :: Parser String restOfLine :: Parser String
restOfLine = newline `after` many (noneOf "\n") restOfLine = newline `after` many (noneOf "\n")
{- Intentionally ignores command failure; the whole point is to work around getOutput :: String -> [String] -> Maybe [(String, String)] -> IO (String, Bool)
- that. -}
getOutput :: String -> [String] -> Maybe [(String, String)] -> IO String
getOutput cmd params env = do getOutput cmd params env = do
putStrLn $ unwords [cmd, show params] putStrLn $ unwords [cmd, show params]
(log, _ok) <- processTranscript' cmd params env Nothing processTranscript' cmd params env Nothing
return log
runParser' :: Parser a -> String -> a runParser' :: Parser a -> String -> a
runParser' p s = either (error . show) id (parse p "" s) runParser' p s = either (error . show) id (parse p "" s)
@ -119,7 +116,7 @@ runParser' p s = either (error . show) id (parse p "" s)
atFile :: FilePath -> String atFile :: FilePath -> String
atFile f = '@':f atFile f = '@':f
runAtFile :: Parser CmdParams -> String -> FilePath -> [String] -> IO String runAtFile :: Parser CmdParams -> String -> FilePath -> [String] -> IO (String, Bool)
runAtFile p s f extraparams = do runAtFile p s f extraparams = do
writeFile f (opts c) writeFile f (opts c)
out <- getOutput (cmd c) (atFile f:extraparams) (env c) out <- getOutput (cmd c) (atFile f:extraparams) (env c)
@ -129,10 +126,11 @@ runAtFile p s f extraparams = do
c = runParser' p s c = runParser' p s
main = do main = do
ghcout <- getOutput "cabal" ghcout <- fst <$> getOutput "cabal"
["build", "--ghc-options=-v -keep-tmp-files"] Nothing ["build", "--ghc-options=-v -keep-tmp-files"] Nothing
gccout <- runAtFile parseGhcLink ghcout "gcc.opt" ["-v"] gccout <- fst <$> runAtFile parseGhcLink ghcout "gcc.opt" ["-v"]
writeFile "gcc.out" gccout collect2out <- fst <$> runAtFile parseGccLink gccout "collect2.opt" ["-v"]
collect2out <- runAtFile parseGccLink gccout "collect2.opt" ["-v"]
writeFile "collect2.out" collect2out writeFile "collect2.out" collect2out
void $ runAtFile parseCollect2 collect2out "ld.opt" [] (out, ok) <- runAtFile parseCollect2 collect2out "ld.opt" []
unless ok $
error $ "ld failed:\n" ++ out