Get this to compile.
This commit is contained in:
parent
0f9def059a
commit
f569b82460
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
module System.Plugins.Consts where
|
module System.Plugins.Consts where
|
||||||
|
|
||||||
#include "../../../config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
|
||||||
#if __GLASGOW_HASKELL__ >= 604
|
#if __GLASGOW_HASKELL__ >= 604
|
||||||
|
@ -50,7 +50,7 @@ module System.Plugins.Env (
|
|||||||
|
|
||||||
) where
|
) where
|
||||||
|
|
||||||
#include "../../../config.h"
|
#include "config.h"
|
||||||
|
|
||||||
import System.Plugins.LoadTypes (Module)
|
import System.Plugins.LoadTypes (Module)
|
||||||
import System.Plugins.Consts ( sysPkgSuffix )
|
import System.Plugins.Consts ( sysPkgSuffix )
|
||||||
@ -76,7 +76,7 @@ import DynFlags (
|
|||||||
Way(WayDyn), dynamicGhc, ways,
|
Way(WayDyn), dynamicGhc, ways,
|
||||||
#endif
|
#endif
|
||||||
defaultDynFlags, initDynFlags)
|
defaultDynFlags, initDynFlags)
|
||||||
import SysTools (initSysTools)
|
import SysTools (initSysTools, initLlvmConfig)
|
||||||
|
|
||||||
import Distribution.Package hiding (
|
import Distribution.Package hiding (
|
||||||
#if MIN_VERSION_ghc(7,6,0)
|
#if MIN_VERSION_ghc(7,6,0)
|
||||||
@ -466,7 +466,8 @@ lookupPkg' p = withPkgEnvs env $ \fms -> go fms p
|
|||||||
-- If we're loading dynamic libs we need the cbits to appear before the
|
-- If we're loading dynamic libs we need the cbits to appear before the
|
||||||
-- real packages.
|
-- real packages.
|
||||||
settings <- initSysTools (Just libdir)
|
settings <- initSysTools (Just libdir)
|
||||||
dflags <- initDynFlags $ defaultDynFlags settings
|
llvmConfig <- initLlvmConfig (Just libdir)
|
||||||
|
dflags <- initDynFlags $ defaultDynFlags settings llvmConfig
|
||||||
libs <- mapM (findHSlib
|
libs <- mapM (findHSlib
|
||||||
#if MIN_VERSION_ghc(7,8,0)
|
#if MIN_VERSION_ghc(7,8,0)
|
||||||
(WayDyn `elem` ways dflags || dynamicGhc)
|
(WayDyn `elem` ways dflags || dynamicGhc)
|
||||||
|
@ -61,7 +61,7 @@ module System.Plugins.Load (
|
|||||||
|
|
||||||
) where
|
) where
|
||||||
|
|
||||||
#include "../../../config.h"
|
#include "config.h"
|
||||||
|
|
||||||
import System.Plugins.Make ( build )
|
import System.Plugins.Make ( build )
|
||||||
import System.Plugins.Env
|
import System.Plugins.Env
|
||||||
@ -104,7 +104,7 @@ import GHC ( defaultCallbacks )
|
|||||||
#else
|
#else
|
||||||
import DynFlags (defaultDynFlags, initDynFlags)
|
import DynFlags (defaultDynFlags, initDynFlags)
|
||||||
import GHC.Paths (libdir)
|
import GHC.Paths (libdir)
|
||||||
import SysTools (initSysTools)
|
import SysTools (initSysTools, initLlvmConfig)
|
||||||
#endif
|
#endif
|
||||||
import GHC.Ptr ( Ptr(..), nullPtr )
|
import GHC.Ptr ( Ptr(..), nullPtr )
|
||||||
#if !MIN_VERSION_ghc(7,4,1)
|
#if !MIN_VERSION_ghc(7,4,1)
|
||||||
@ -127,7 +127,8 @@ readBinIface' hi_path = do
|
|||||||
-- kludgy as hell
|
-- kludgy as hell
|
||||||
#if MIN_VERSION_ghc(7,2,0)
|
#if MIN_VERSION_ghc(7,2,0)
|
||||||
mySettings <- initSysTools (Just libdir) -- how should we really set the top dir?
|
mySettings <- initSysTools (Just libdir) -- how should we really set the top dir?
|
||||||
dflags <- initDynFlags (defaultDynFlags mySettings)
|
llvmConfig <- initLlvmConfig (Just libdir)
|
||||||
|
dflags <- initDynFlags (defaultDynFlags mySettings llvmConfig)
|
||||||
e <- newHscEnv dflags
|
e <- newHscEnv dflags
|
||||||
#else
|
#else
|
||||||
e <- newHscEnv defaultCallbacks undefined
|
e <- newHscEnv defaultCallbacks undefined
|
||||||
|
@ -25,7 +25,7 @@ module System.Plugins.Parser (
|
|||||||
replaceModName
|
replaceModName
|
||||||
) where
|
) where
|
||||||
|
|
||||||
#include "../../../config.h"
|
#include "config.h"
|
||||||
|
|
||||||
import Data.List
|
import Data.List
|
||||||
import Data.Char
|
import Data.Char
|
||||||
|
@ -58,7 +58,7 @@ module System.Plugins.Utils (
|
|||||||
) where
|
) where
|
||||||
|
|
||||||
|
|
||||||
#include "../../../config.h"
|
#include "config.h"
|
||||||
|
|
||||||
import System.Plugins.Env ( isLoaded )
|
import System.Plugins.Env ( isLoaded )
|
||||||
import System.Plugins.Consts ( objSuf, hiSuf, tmpDir )
|
import System.Plugins.Consts ( objSuf, hiSuf, tmpDir )
|
||||||
@ -289,7 +289,7 @@ findFile (ext:exts) file
|
|||||||
infixr 6 </>
|
infixr 6 </>
|
||||||
infixr 6 <.>
|
infixr 6 <.>
|
||||||
|
|
||||||
(</>), (<.>), (<+>), (<>) :: FilePath -> FilePath -> FilePath
|
(</>), (<.>), (<+>) :: FilePath -> FilePath -> FilePath
|
||||||
[] </> b = b
|
[] </> b = b
|
||||||
a </> b = a ++ "/" ++ b
|
a </> b = a ++ "/" ++ b
|
||||||
|
|
||||||
@ -299,9 +299,6 @@ a <.> b = a ++ "." ++ b
|
|||||||
[] <+> b = b
|
[] <+> b = b
|
||||||
a <+> b = a ++ " " ++ b
|
a <+> b = a ++ " " ++ b
|
||||||
|
|
||||||
[] <> b = b
|
|
||||||
a <> b = a ++ b
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- | dirname : return the directory portion of a file path
|
-- | dirname : return the directory portion of a file path
|
||||||
-- if null, return "."
|
-- if null, return "."
|
||||||
|
Loading…
x
Reference in New Issue
Block a user