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 /compiler/GHC | |
| 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 'compiler/GHC')
| -rw-r--r-- | compiler/GHC/Settings/IO.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/GHC/Settings/IO.hs b/compiler/GHC/Settings/IO.hs index b5defa0ee2..82f0b6b2d9 100644 --- a/compiler/GHC/Settings/IO.hs +++ b/compiler/GHC/Settings/IO.hs @@ -137,7 +137,7 @@ initSettings top_dir = do as_args = map Option cc_args ld_prog = cc_prog ld_args = map Option (cc_args ++ words cc_link_args_str) - ld_r_prog <- getSetting "Merge objects command" + ld_r_prog <- getToolSetting "Merge objects command" ld_r_args <- getSetting "Merge objects flags" llvmTarget <- getSetting "LLVM target" |