Skip to content
GitLab
Commit edf0e2ec authored by Alexis Williams's avatar Alexis Williams
Browse files

(Hopefully) fix GHC 7.10

parent 908f5c4f
Hide whitespace changes
Inline Side-by-side
cabal-install/Distribution/Client/CmdInstall.hs
View file @ edf0e2ec
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE MultiWayIf #-}
{-# LANGUAGE NamedFieldPuns #-}
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE ViewPatterns #-}
......@@ -328,10 +327,10 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags)
envFileExists <- doesFileExist envFile
envEntries <- if
| compilerFlavor == GHC || compilerFlavor == GHCJS
, supportsPkgEnvFiles
, envFileExists -> readGhcEnvironmentFile envFile
| otherwise -> return []
(compilerFlavor == GHC || compilerFlavor == GHCJS)
&& supportsPkgEnvFiles && envFileExists
then readGhcEnvironmentFile envFile
else return []
cabalDir <- getCabalDir
let
......
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