ghcjs-pkg fixes for ghc 8.0.2

ghcjs · Jan 12, 2017 · 2dc1480 · 2dc1480
1 parent 5d8b0e2
commit 2dc1480
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/ghcjs.cabal b/ghcjs.cabal
@@ -235,7 +235,7 @@ Executable ghcjs-pkg
     Hs-Source-Dirs:   src-bin
     Build-Depends:    ghcjs,
                       base       >= 4   && < 5,
-                      directory  >= 1   && < 1.3,
+                      directory,
                       process    >= 1   && < 1.6,
                       filepath,
                       containers,

diff --git a/src-bin/Pkg.hs b/src-bin/Pkg.hs
@@ -1114,6 +1114,9 @@ convertPackageInfoToCacheFormat pkg =
        GhcPkg.extraLibraries     = extraLibraries pkg,
        GhcPkg.extraGHCiLibraries = extraGHCiLibraries pkg,
        GhcPkg.libraryDirs        = libraryDirs pkg,
+#if MIN_VERSION_ghc(8,0,2)
+       GhcPkg.libraryDynDirs     = libraryDynDirs pkg,
+#endif
        GhcPkg.frameworks         = frameworks pkg,
        GhcPkg.frameworkDirs      = frameworkDirs pkg,
        GhcPkg.ldOptions          = ldOptions pkg,
@@ -1603,14 +1606,17 @@ checkPackageConfig pkg verbosity db_stack
   checkDuplicateDepends (depends pkg)
   mapM_ (checkDir False "import-dirs")  (importDirs pkg)
   mapM_ (checkDir True  "library-dirs") (libraryDirs pkg)
+#if MIN_VERSION_ghc(8,0,2)
+  mapM_ (checkDir True  "dynamic-library-dirs") (libraryDynDirs pkg)
+#endif
   mapM_ (checkDir True  "include-dirs") (includeDirs pkg)
   mapM_ (checkDir True  "framework-dirs") (frameworkDirs pkg)
   mapM_ (checkFile   True "haddock-interfaces") (haddockInterfaces pkg)
   mapM_ (checkDirURL True "haddock-html")       (haddockHTMLs pkg)
   checkDuplicateModules pkg
   checkExposedModules db_stack pkg
   --  disabled for GHCJS, package may not have native libs
-  --  mapM_ (checkHSLib verbosity (libraryDirs pkg)) (hsLibraries pkg)
+  -- mapM_ (checkHSLib verbosity (libraryDirs pkg ++ libraryDynDirs pkg)) (hsLibraries pkg)
   checkOtherModules  pkg
   -- ToDo: check these somehow?
   --    extra_libraries :: [String],