Merge pull request #3160 from varosi/varosi/mingw_bin

#3126 Use MinGW bin folder for dynamic libraries searching
commercialhaskell · Jun 11, 2017 · 78ebdf5 · 78ebdf5
2 parents 0e5a2e1 + a13eb4b
commit 78ebdf5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -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:
 

diff --git a/src/Stack/Setup/Installed.hs b/src/Stack/Setup/Installed.hs
@@ -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
@@ -155,6 +156,7 @@ extraDirs tool = do
                 ]
             , edLib =
                 [ dir </> $(mkRelDir "mingw64") </> $(mkRelDir "lib")
+                , dir </> $(mkRelDir "mingw64") </> $(mkRelDir "bin")
                 ]
             }
         (_, isGHC -> True) -> return mempty