mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove ifdef for older base than git-annex.cabal allows

Browse source
This commit is contained in:
Joey Hess 2017-12-14 13:45:50 -04:00
parent adeaa84ac3
commit 664a4d1873
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Annex/Path.hs
View file

@ -5,8 +5,6 @@
- Licensed under the GNU GPL version 3 or higher. - Licensed under the GNU GPL version 3 or higher.
-} -}
{-# LANGUAGE CPP #-}
module Annex.Path where module Annex.Path where
import Common import Common
@ -17,7 +15,7 @@ import System.Environment (getExecutablePath)
{- A fully qualified path to the currently running git-annex program. {- 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, - 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, - it might return just the basename. Fall back to reading the programFile,
- or searching for the command name in PATH. - or searching for the command name in PATH.
@ -31,12 +29,8 @@ programPath = go =<< getEnv "GIT_ANNEX_PROGRAMPATH"
where where
go (Just p) = return p go (Just p) = return p
go Nothing = do go Nothing = do
#if MIN_VERSION_base(4,6,0)
exe <- getExecutablePath exe <- getExecutablePath
p <- if isAbsolute exe p <- if isAbsolute exe
then return exe then return exe
else readProgramFile else readProgramFile
#else
p <- readProgramFile
#endif
maybe cannotFindProgram return =<< searchPath p maybe cannotFindProgram return =<< searchPath p