Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#3126 Use MinGW bin folder for dynamic libraries searching #3160

Merged
merged 4 commits into from
Jun 11, 2017
Merged

#3126 Use MinGW bin folder for dynamic libraries searching #3160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2c47f4
#3126 Use MinGW bin folder for dynamic libraries searching
May 4, 2017
bbc1291
Documentation update
May 4, 2017
66a02ce
Fixed link in changelog
May 30, 2017
a13eb4b
Merge branch 'master' into varosi/mingw_bin
mgsloan Jun 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Other enhancements:
* Better error messages when creating or building packages which alias
wired-in packages. See
[#3172](https://github.com/commercialhaskell/stack/issues/3172).
* MinGW bin folder now is searched for dynamic libraries. See [#3126](https://github.com/commercialhaskell/stack/issues/3126)

Bug fixes:

Expand Down
2 changes: 2 additions & 0 deletions src/Stack/Setup/Installed.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ extraDirs tool = do
]
, edLib =
[ dir </> $(mkRelDir "mingw32") </> $(mkRelDir "lib")
, dir </> $(mkRelDir "mingw32") </> $(mkRelDir "bin")
]
}
(Platform Cabal.X86_64 Cabal.Windows, "msys2") -> return mempty
Expand All @@ -155,6 +156,7 @@ extraDirs tool = do
]
, edLib =
[ dir </> $(mkRelDir "mingw64") </> $(mkRelDir "lib")
, dir </> $(mkRelDir "mingw64") </> $(mkRelDir "bin")
]
}
(_, isGHC -> True) -> return mempty
Expand Down