diff options
| author | GHC GitLab CI <ghc-ci@gitlab-haskell.org> | 2020-08-09 09:35:47 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-09-03 19:55:29 -0400 |
| commit | 34e0fa963f35a77093fc7111a80c557fc6bd614f (patch) | |
| tree | 4b1df23ca2cb1b80fe2bc73b6c0a028e601e0b80 /configure.ac | |
| parent | 4891c18a49876958b44e50dc6e2f24326d92052f (diff) | |
| download | haskell-wip/T18550.tar.gz | |
configure: Avoid hard-coded ld path on Windowswip/T18550
The fix to #17962 ended up regressing on Windows as it failed to
replicate the logic responsible for overriding the toolchain paths on
Windows. This resulted in a hard-coded path to a directory that likely
doesn't exist on the user's system (#18550).
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 5e3dfa5470..f080b296bf 100644 --- a/configure.ac +++ b/configure.ac @@ -449,6 +449,8 @@ then NM="${mingwbin}nm.exe" RANLIB="${mingwbin}ranlib.exe" OBJDUMP="${mingwbin}objdump.exe" + MergeObjsCmd="$LD" + MergeObjsArgs="-r --oformat=pe-bigobj-x86-64" fp_prog_ar="${mingwbin}ar.exe" AC_PATH_PROG([Genlib],[genlib]) |