e13e48d · Idris-dev · git.iko.soy

src/IRTS/System.hs+2−1

compare with master

unifiedsplit

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

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

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

55

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

56−getIdrisLibDir = do dir <- getDataDir

57+ dir <- maybe getDataDir return libPath

57 return $ addTrailingPathSeparator dir

58 return $ addTrailingPathSeparator dir

58

59

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

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

src/Idris/IBC.hs+2−1

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

14import qualified Idris.Docstrings as D

15import Idris.Docstrings (Docstring)

16import Idris.Output

17+import IRTS.System (getIdrisLibDir)

17import Paths_idris

18import Paths_idris

18

19

19import qualified Cheapskate.Types as CT

20import qualified Cheapskate.Types as CT

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

103

104

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

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

105loadPkgIndex :: String -> Idris ()

106loadPkgIndex :: String -> Idris ()

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

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

107 addImportDir (ddir </> pkg)

108 addImportDir (ddir </> pkg)

108 fp <- findPkgIndex pkg

109 fp <- findPkgIndex pkg

109 loadIBC True fp

110 loadIBC True fp

src/Idris/REPL.hs+1−1

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

1620 makeOption _ = return ()

1621

1622 addPkgDir :: String -> Idris ()

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

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

1624 addImportDir (ddir </> p)

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

1626