Respect GHC_PACKAGE_PATH

Fixes haskell#3728. Fixes haskell#2711.
ttuegel · Sep 1, 2016 · 692ba50 · 692ba50
1 parent 8cd7d24
commit 692ba50
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/Cabal/Distribution/Simple/GHC.hs b/Cabal/Distribution/Simple/GHC.hs
@@ -86,14 +86,15 @@ import Distribution.Text
 import Distribution.Utils.NubList
 import Language.Haskell.Extension
 
+import Distribution.Compat.Environment ( lookupEnv )
 import qualified Data.Map as Map
 import Data.Version             ( showVersion )
 import System.Directory
          ( doesFileExist, getAppUserDataDirectory, createDirectoryIfMissing
          , canonicalizePath, removeFile )
 import System.FilePath          ( (</>), (<.>), takeExtension
                                 , takeDirectory, replaceExtension
-                                , isRelative )
+                                , isRelative, searchPathSeparator )
 import qualified System.Info
 
 -- -----------------------------------------------------------------------------
@@ -283,9 +284,11 @@ getInstalledPackages :: Verbosity -> Compiler -> PackageDBStack
                      -> ProgramConfiguration
                      -> IO InstalledPackageIndex
 getInstalledPackages verbosity comp packagedbs conf = do
-  checkPackageDbEnvVar
   checkPackageDbStack comp packagedbs
-  pkgss <- getInstalledPackages' verbosity packagedbs conf
+  envPackageDBs <- maybe []
+                   (map SpecificPackageDB . unintersperse searchPathSeparator)
+                   <$> lookupEnv "GHC_PACKAGE_PATH"
+  pkgss <- getInstalledPackages' verbosity (envPackageDBs ++ packagedbs) conf
   index <- toPackageIndex verbosity pkgss conf
   return $! hackRtsPackage index
 
@@ -351,10 +354,6 @@ getUserPackageDB _verbosity ghcProg (Platform arch os) = do
       | otherwise                        = "package.conf"
     Just ghcVersion = programVersion ghcProg
 
-checkPackageDbEnvVar :: IO ()
-checkPackageDbEnvVar =
-    Internal.checkPackageDbEnvVar "GHC" "GHC_PACKAGE_PATH"
-
 checkPackageDbStack :: Compiler -> PackageDBStack -> IO ()
 checkPackageDbStack comp = if flagPackageConf implInfo
                               then checkPackageDbStackPre76

diff --git a/Cabal/Distribution/Simple/GHCJS.hs b/Cabal/Distribution/Simple/GHCJS.hs
@@ -48,7 +48,9 @@ import Language.Haskell.Extension
 import qualified Data.Map as Map
 import System.Directory         ( doesFileExist )
 import System.FilePath          ( (</>), (<.>), takeExtension
-                                , takeDirectory, replaceExtension )
+                                , takeDirectory, replaceExtension
+                                , searchPathSeparator )
+import Distribution.Compat.Environment ( lookupEnv )
 
 configure :: Verbosity -> Maybe FilePath -> Maybe FilePath
           -> ProgramConfiguration
@@ -187,9 +189,11 @@ getPackageDBContents verbosity packagedb conf = do
 getInstalledPackages :: Verbosity -> PackageDBStack -> ProgramConfiguration
                      -> IO InstalledPackageIndex
 getInstalledPackages verbosity packagedbs conf = do
-  checkPackageDbEnvVar
   checkPackageDbStack packagedbs
-  pkgss <- getInstalledPackages' verbosity packagedbs conf
+  envPackageDBs <- maybe []
+                   (map SpecificPackageDB . unintersperse searchPathSeparator)
+                   <$> lookupEnv "GHCJS_PACKAGE_PATH"
+  pkgss <- getInstalledPackages' verbosity (envPackageDBs ++ packagedbs) conf
   index <- toPackageIndex verbosity pkgss conf
   return $! index
 
@@ -209,10 +213,6 @@ toPackageIndex verbosity pkgss conf = do
   where
     Just ghcjsProg = lookupProgram ghcjsProgram conf
 
-checkPackageDbEnvVar :: IO ()
-checkPackageDbEnvVar =
-    Internal.checkPackageDbEnvVar "GHCJS" "GHCJS_PACKAGE_PATH"
-
 checkPackageDbStack :: PackageDBStack -> IO ()
 checkPackageDbStack (GlobalPackageDB:rest)
   | GlobalPackageDB `notElem` rest = return ()