diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-10-31 16:13:50 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-10-31 16:44:41 +0100 |
| commit | 7a48e6caad54609f1bbefc3bd60e8352edcd2cc7 (patch) | |
| tree | 3d861514f9fda916710c5b78f20af4d2c6497f5f /utils/ghc-cabal | |
| parent | 8160f42b8dad33e47b4c73ed3f9bf889462e7bfe (diff) | |
| download | haskell-7a48e6caad54609f1bbefc3bd60e8352edcd2cc7.tar.gz | |
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
Diffstat (limited to 'utils/ghc-cabal')
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 2 |
1 files changed, 1 insertions, 1 deletions
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 |