Skip to content

Commit

Permalink
Revert "Canonicalize path to Cabal file, partially towards haskell#2994
Browse files Browse the repository at this point in the history
…."

This reverts commit f907f1a.
This commit caused a regression in Docker, see
https://ghc.haskell.org/trac/ghc/ticket/11326
  • Loading branch information
ezyang committed Dec 31, 2015
1 parent 072e472 commit bf4d05e
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions Cabal/Distribution/Simple.hs
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,7 @@ import Distribution.Text
-- Base
import System.Environment(getArgs, getProgName)
import System.Directory(removeFile, doesFileExist,
doesDirectoryExist, removeDirectoryRecursive,
canonicalizePath)
doesDirectoryExist, removeDirectoryRecursive)
import System.Exit (exitWith,ExitCode(..))
import System.FilePath(searchPathSeparator)
import Distribution.Compat.Environment (getEnvironment)
Expand Down Expand Up @@ -233,8 +232,7 @@ configureAction hooks flags args = do
case mdescr of
Just descr -> return (Nothing, descr)
Nothing -> do
pdfile0 <- defaultPackageDesc verbosity
pdfile <- canonicalizePath pdfile0
pdfile <- defaultPackageDesc verbosity
descr <- readPackageDescription verbosity pdfile
return (Just pdfile, descr)

Expand Down

0 comments on commit bf4d05e

Please sign in to comment.