Commit edf0e2ec authored by Alexis Williams's avatar Alexis Williams
Browse files

(Hopefully) fix GHC 7.10

parent 908f5c4f
{-# LANGUAGE LambdaCase #-} {-# LANGUAGE LambdaCase #-}
{-# LANGUAGE MultiWayIf #-}
{-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE NamedFieldPuns #-}
{-# LANGUAGE RecordWildCards #-} {-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE ViewPatterns #-} {-# LANGUAGE ViewPatterns #-}
...@@ -328,10 +327,10 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags) ...@@ -328,10 +327,10 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags)
envFileExists <- doesFileExist envFile envFileExists <- doesFileExist envFile
envEntries <- if envEntries <- if
| compilerFlavor == GHC || compilerFlavor == GHCJS (compilerFlavor == GHC || compilerFlavor == GHCJS)
, supportsPkgEnvFiles && supportsPkgEnvFiles && envFileExists
, envFileExists -> readGhcEnvironmentFile envFile then readGhcEnvironmentFile envFile
| otherwise -> return [] else return []
cabalDir <- getCabalDir cabalDir <- getCabalDir
let let
......
Markdown is supported
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