Skip to content
Snippets Groups Projects
Commit 943dc155 authored by Brian Smith's avatar Brian Smith
Browse files

Always invoke the ld.exe that is in $ghc-bin\..\gcc-lib on Windows, because ld...

Always invoke the ld.exe that is in $ghc-bin\..\gcc-lib on Windows, because ld is probably not in the path on Windows.
parent b2538587
No related merge requests found
...@@ -211,7 +211,14 @@ buildGHC pkg_descr lbi verbose = do ...@@ -211,7 +211,14 @@ buildGHC pkg_descr lbi verbose = do
++ stubObjs ++ stubObjs
rawSystemPathExit verbose "ar" arArgs rawSystemPathExit verbose "ar" arArgs
ifProfLib (rawSystemPathExit verbose "ar" arProfArgs) ifProfLib (rawSystemPathExit verbose "ar" arProfArgs)
ifGHCiLib (rawSystemPathExit verbose "ld" ldArgs) #if defined(mingw32_TARGET_OS) || defined(mingw32_HOST_OS)
let (compilerDir, _) = splitFileName $ compilerPath (compiler lbi)
(baseDir, _) = splitFileName compilerDir
ld = baseDir `joinFileName` "gcc-lib\\ld.exe"
ifGHCiLib (rawSystemExit verbose ld ldArgs)
#else
ifGHCiLib (rawSystemPathExit verbose "ld" ldArgs)
#endif
-- build any executables -- build any executables
withExe pkg_descr $ \ (Executable exeName' modPath exeBi) -> do withExe pkg_descr $ \ (Executable exeName' modPath exeBi) -> do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment