remove ifdef for older base than git-annex.cabal allows
This commit is contained in:
parent
adeaa84ac3
commit
664a4d1873
1 changed files with 1 additions and 7 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue