diff options
author | Ben Gamari <bgamari.foss@gmail.com> | 2016-11-11 15:53:36 -0500 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2016-11-11 20:27:31 -0500 |
commit | 7eae862a5af185e918aa29d63a7a9484292513e4 (patch) | |
tree | 6471d96b23f87b9b78c5de18e428210d3fe20958 /utils/ghc-pkg | |
parent | 46e2befd9fc63c9cd42657bffecc423eda18847d (diff) | |
download | haskell-7eae862a5af185e918aa29d63a7a9484292513e4.tar.gz |
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
Diffstat (limited to 'utils/ghc-pkg')
-rw-r--r-- | utils/ghc-pkg/Main.hs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index 063a8067d9..290993f4a5 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -822,6 +822,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 |