[commit: ghc] master: Make ghc-cabal's `System.Directory` import more robust (7a48e6c)

git at git.haskell.org git at git.haskell.org
Sat Oct 31 15:44:49 UTC 2015


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

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

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

commit 7a48e6caad54609f1bbefc3bd60e8352edcd2cc7
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Oct 31 16:13:50 2015 +0100

    Make ghc-cabal's `System.Directory` import more robust
    
    Starting with directory-1.2.5 there will be a nameclash with
    `withCurrentDirectory` and `MIN_VERSION_filepath()` isn't available at
    bootstrap-time with the current GHC build-system.
    
    By using explicit import lists we avoid CPP altogether


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

7a48e6caad54609f1bbefc3bd60e8352edcd2cc7
 utils/ghc-cabal/Main.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index 6e3e10c..6da7733 100644
--- a/utils/ghc-cabal/Main.hs
+++ b/utils/ghc-cabal/Main.hs
@@ -29,7 +29,7 @@ import qualified Data.ByteString.Lazy.Char8 as BS
 import Data.List
 import Data.Maybe
 import System.IO
-import System.Directory
+import System.Directory (setCurrentDirectory, getCurrentDirectory, doesFileExist)
 import System.Environment
 import System.Exit      (exitWith, ExitCode(..))
 import System.FilePath



More information about the ghc-commits mailing list