Commit bf4d05ef authored by Edward Z. Yang's avatar Edward Z. Yang
Browse files

Revert "Canonicalize path to Cabal file, partially towards #2994."

This reverts commit f907f1a6.
This commit caused a regression in Docker, see
https://ghc.haskell.org/trac/ghc/ticket/11326
parent 072e4728
......@@ -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)
......@@ -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)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment