diff options
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/EvilLinker.hs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Build/EvilLinker.hs b/Build/EvilLinker.hs index d1b0cc746..fa260edab 100644 --- a/Build/EvilLinker.hs +++ b/Build/EvilLinker.hs @@ -95,19 +95,13 @@ parseCollect2 = do path <- manyTill anyChar (try $ string ldcmd) void $ char ' ' params <- restOfLine - return $ CmdParams (path ++ ldcmd) (skipHack $ escapeDosPaths params) Nothing + return $ CmdParams (path ++ ldcmd) (escapeDosPaths params) Nothing where ldcmd = "ld.exe" versionline = do void $ string "collect2 version" restOfLine -{- For unknown reasons, asking the linker to link this in fails, - - with error about multiple definitions of a symbol from the library. - - This is a horrible hack. -} -skipHack :: String -> String -skipHack = replace "dist/build/git-annex/git-annex-tmp/Utility/winprocess.o" "" - {- Input contains something like - c:/program files/haskell platform/foo -LC:/Program Files/Haskell Platform/ -L... - and the *right* spaces must be escaped with \ |