Fix Windows build to work with ghc 7.10
It was failing at link time, some problem with terminatePID.
Re-implemented that to not use a C wrapper function, which cleared up the
problem. Removed old EvilLinker hack with must have been related to the
same problem.
Note that I have not tested this with older ghc's. In
f11f7520b5
I mention having tried this
approach before, and getting segfaults.. So, who knows. It seems to work
fine with ghc 7.10 at least.
This commit is contained in:
parent
4ee9cb9c6d
commit
86e638567a
5 changed files with 22 additions and 20 deletions
|
@ -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 \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue