From 7a48e6caad54609f1bbefc3bd60e8352edcd2cc7 Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Sat, 31 Oct 2015 16:13:50 +0100 Subject: 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 --- utils/ghc-cabal/Main.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'utils/ghc-cabal') diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 6e3e10cee7..6da7733cad 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 -- cgit v1.2.1