Merge pull request #3160 from varosi/varosi/mingw_bin

mgsloan · web-flow · commit 78ebdf5313ae · 2017-06-11T15:13:44.000-07:00
#3126 Use MinGW bin folder for dynamic libraries searching
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

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@ extraDirs tool = do`
`142`	`142`	`]`
`143`	`143`	`, edLib =`
`144`	`144`	`[ dir </> $(mkRelDir "mingw32") </> $(mkRelDir "lib")`
	`145`	`+ , dir </> $(mkRelDir "mingw32") </> $(mkRelDir "bin")`
`145`	`146`	`]`
`146`	`147`	`}`
`147`	`148`	`(Platform Cabal.X86_64 Cabal.Windows, "msys2") -> return mempty`
`@@ -155,6 +156,7 @@ extraDirs tool = do`
`155`	`156`	`]`
`156`	`157`	`, edLib =`
`157`	`158`	`[ dir </> $(mkRelDir "mingw64") </> $(mkRelDir "lib")`
	`159`	`+ , dir </> $(mkRelDir "mingw64") </> $(mkRelDir "bin")`
`158`	`160`	`]`
`159`	`161`	`}`
`160`	`162`	`(_, isGHC -> True) -> return mempty`