From b0f20ffb0446e7d4eccf78504a1c73ec005575ca Mon Sep 17 00:00:00 2001 From: Kohei Suzuki Date: Sat, 5 Oct 2013 12:19:30 +0900 Subject: [PATCH] Support GHC < 7.6.0 which doesn't have getExecutablePath --- ghc-mod.cabal | 2 ++ test/InfoSpec.hs | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/ghc-mod.cabal b/ghc-mod.cabal index c355e68..c08f907 100644 --- a/ghc-mod.cabal +++ b/ghc-mod.cabal @@ -131,6 +131,8 @@ Test-Suite spec , time , transformers , hspec >= 1.7.1 + if impl(ghc < 7.6.0) + Build-Depends: executable-path Source-Repository head Type: git diff --git a/test/InfoSpec.hs b/test/InfoSpec.hs index 7c63638..1fcbf35 100644 --- a/test/InfoSpec.hs +++ b/test/InfoSpec.hs @@ -1,10 +1,15 @@ +{-# LANGUAGE CPP #-} module InfoSpec where import Control.Applicative ((<$>)) import Data.List (isPrefixOf) import Language.Haskell.GhcMod import Language.Haskell.GhcMod.Cradle +#ifdef VERSION_executable_path +import System.Environment.Executable (getExecutablePath) +#else import System.Environment (getExecutablePath) +#endif import System.Exit import System.FilePath import System.Process