e13e48d · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Merge branch 'master' of github.com:idris-lang/Idris-dev

commite13e48d7d440518ee4173a2f93b040dd76b27d91 authorEdwin Brady <ecb10@st-andrews.ac.uk> dateSat 31 Jan 2015, 12:44 (12 years ago) parent725821b f03d65c

3 files changed+5−3

compare with master

unifiedsplit

src/IRTS/System.hs+2−1 src/Idris/IBC.hs+2−1 src/Idris/REPL.hs+1−1

src/IRTS/System.hs+2−1

@@ -53,7 +53,8 @@ getLibFlags = do dir <- getDataDir

5353 return $ ["-L" ++ (dir </> "rts"),

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

5555

56−getIdrisLibDir = do dir <- getDataDir

56+getIdrisLibDir = do libPath <- environment "IDRIS_LIBRARY_PATH"

57+ dir <- maybe getDataDir return libPath

5758 return $ addTrailingPathSeparator dir

5859

5960#if defined(FREEBSD) || defined(DRAGONFLY)

src/Idris/IBC.hs+2−1

@@ -14,6 +14,7 @@ import Idris.Delaborate

1414import qualified Idris.Docstrings as D

1515import Idris.Docstrings (Docstring)

1616import Idris.Output

17+import IRTS.System (getIdrisLibDir)

1718import Paths_idris

1819

1920import qualified Cheapskate.Types as CT

@@ -103,7 +104,7 @@ loadIBC reexport fp

103104

104105-- | Load an entire package from its index file

105106loadPkgIndex :: String -> Idris ()

106−loadPkgIndex pkg = do ddir <- runIO $ getDataDir

107+loadPkgIndex pkg = do ddir <- runIO $ getIdrisLibDir

107108 addImportDir (ddir </> pkg)

108109 fp <- findPkgIndex pkg

109110 loadIBC True fp

src/Idris/REPL.hs+1−1

@@ -1620,7 +1620,7 @@ idrisMain opts =

16201620 makeOption _ = return ()

16211621

16221622 addPkgDir :: String -> Idris ()

1623− addPkgDir p = do ddir <- runIO $ getDataDir

1623+ addPkgDir p = do ddir <- runIO $ getIdrisLibDir

16241624 addImportDir (ddir </> p)

16251625 addIBC (IBCImportDir (ddir </> p))

16261626