e42792f · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

on master help sign in

Drop trailing separators when specifying dirs to compiler

e42792fNiklas Larsson9 years ago

src/IRTS/System.hs+4−3

@@ -30,7 +30,8 @@ import Control.Applicative ((<$>))

30import Data.List.Split

31import Data.Maybe (fromMaybe)

32import System.Environment

33−import System.FilePath (addTrailingPathSeparator, (</>))

33+import System.FilePath (addTrailingPathSeparator, dropTrailingPathSeparator,

34+ (</>))

36getIdrisDataDir :: IO String

37getIdrisDataDir :: IO String

@@ -81,7 +82,7 @@ gmpLib = []

81#endif

82#endif

83getLibFlags = do dir <- getIdrisCRTSDir

84getLibFlags = do dir <- getIdrisCRTSDir

84− return $ ["-L" ++ dir,

85+ return $ ["-L" ++ dropTrailingPathSeparator dir,

85 "-lidris_rts"] ++ extraLib ++ gmpLib ++ ["-lpthread"]

86 "-lidris_rts"] ++ extraLib ++ gmpLib ++ ["-lpthread"]

87getIdrisLibDir = addTrailingPathSeparator <$> overrideIdrisSubDirWith "libs" "IDRIS_LIBRARY_PATH"

88getIdrisLibDir = addTrailingPathSeparator <$> overrideIdrisSubDirWith "libs" "IDRIS_LIBRARY_PATH"

@@ -97,4 +98,4 @@ getIdrisCRTSDir = do

97 return $ addTrailingPathSeparator (ddir </> "rts")

98 return $ addTrailingPathSeparator (ddir </> "rts")

99getIncFlags = do dir <- getIdrisCRTSDir

100getIncFlags = do dir <- getIdrisCRTSDir

100− return $ ("-I" ++ dir) : extraInclude

101+ return $ ("-I" ++ dropTrailingPathSeparator dir) : extraInclude