Commit 016b10c5 authored by Tamar Christina's avatar Tamar Christina Committed by Ben Gamari

Add GCC bin folder to search path.

D3155 added pthread by default to GHCi.  However this was only tested
using something running in an msys2 shell. As it turns out it's been
picking up pthread in the environment and not the inplace gcc.

This results in an error when using ghci outside of msys2.

Test Plan: start cmd, start ghc-stage2 --interactive

Reviewers: austin, hvr, bgamari, dfeuer

Reviewed By: dfeuer

Subscribers: dfeuer, thomie

Differential Revision: https://phabricator.haskell.org/D3279
parent 8ca4bb1c
...@@ -345,8 +345,10 @@ linkCmdLineLibs' hsc_env pls = ...@@ -345,8 +345,10 @@ linkCmdLineLibs' hsc_env pls =
if null cmdline_lib_specs then return pls if null cmdline_lib_specs then return pls
else do else do
-- Add directories to library search paths -- Add directories to library search paths, this only has an effect
let all_paths = let paths = framework_paths -- on Windows. On Unix OSes this function is a NOP.
let all_paths = let paths = takeDirectory (fst $ sPgm_c $ settings dflags)
: framework_paths
++ lib_paths ++ lib_paths
++ [ takeDirectory dll | DLLPath dll <- libspecs ] ++ [ takeDirectory dll | DLLPath dll <- libspecs ]
in nub $ map normalise paths in nub $ map normalise paths
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment