diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-12-14 13:45:50 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-12-14 13:45:50 -0400 |
| commit | d0c01078383c27b355d8ec512210953c0b401f87 (patch) | |
| tree | c184f63a4efaccc9775ff114d4001c0f2e3547b0 /Annex | |
| parent | 456ce3ff7ff90e2b03874a90d949485f9c3e00b2 (diff) | |
remove ifdef for older base than git-annex.cabal allows
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Path.hs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Annex/Path.hs b/Annex/Path.hs index 8209e5ba0..0f85b11bf 100644 --- a/Annex/Path.hs +++ b/Annex/Path.hs @@ -5,8 +5,6 @@ - Licensed under the GNU GPL version 3 or higher. -} -{-# LANGUAGE CPP #-} - module Annex.Path where import Common @@ -17,7 +15,7 @@ import System.Environment (getExecutablePath) {- A fully qualified path to the currently running git-annex program. - - - getExecutablePath is available since ghc 7.4.2. On OSs it supports + - getExecutablePath is used when possible. On OSs it supports - well, it returns the complete path to the program. But, on other OSs, - it might return just the basename. Fall back to reading the programFile, - or searching for the command name in PATH. @@ -31,12 +29,8 @@ programPath = go =<< getEnv "GIT_ANNEX_PROGRAMPATH" where go (Just p) = return p go Nothing = do -#if MIN_VERSION_base(4,6,0) exe <- getExecutablePath p <- if isAbsolute exe then return exe else readProgramFile -#else - p <- readProgramFile -#endif maybe cannotFindProgram return =<< searchPath p |