[commit: ghc] master: ghc-pkg: Munge dynamic library directories (7eae862)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7eae862a5af185e918aa29d63a7a9484292513e4/ghc

>---------------------------------------------------------------

commit 7eae862a5af185e918aa29d63a7a9484292513e4
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


>---------------------------------------------------------------

7eae862a5af185e918aa29d63a7a9484292513e4
 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 063a806..290993f 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