[commit: ghc] ghc-8.0: ghc-pkg: Munge dynamic library directories (e7017ca)
git at git.haskell.org
git at git.haskell.org
Fri Nov 11 21:34:05 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-8.0
Link : http://ghc.haskell.org/trac/ghc/changeset/e7017ca8b02ad7abb7c6cd9100e44fb8a215985f/ghc
>---------------------------------------------------------------
commit e7017ca8b02ad7abb7c6cd9100e44fb8a215985f
Author: Ben Gamari <bgamari.foss at gmail.com>
Date: Fri Nov 11 15:53:36 2016 -0500
ghc-pkg: Munge dynamic library directories
Otherwise we end up looking in the wrong place for dynamic libraries on
Windows. This addresses a regression introduced by D2611. See #12479.
Test Plan: validate across platforms
Reviewers: austin
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2640
GHC Trac Issues: #12479
(cherry picked from commit 75e69edb498511cf2b28dec4e14e6d11232f3e32)
>---------------------------------------------------------------
e7017ca8b02ad7abb7c6cd9100e44fb8a215985f
utils/ghc-pkg/Main.hs | 1 +
1 file changed, 1 insertion(+)
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
index 3f12be4..c357ebb 100644
--- a/utils/ghc-pkg/Main.hs
+++ b/utils/ghc-pkg/Main.hs
@@ -810,6 +810,7 @@ mungePackagePaths top_dir pkgroot pkg =
importDirs = munge_paths (importDirs pkg),
includeDirs = munge_paths (includeDirs pkg),
libraryDirs = munge_paths (libraryDirs pkg),
+ libraryDynDirs = munge_paths (libraryDynDirs pkg),
frameworkDirs = munge_paths (frameworkDirs pkg),
haddockInterfaces = munge_paths (haddockInterfaces pkg),
-- haddock-html is allowed to be either a URL or a file
More information about the ghc-commits
mailing list