wrath/shaniqua-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get this to compile.

Browse Source
This commit is contained in:
Galen Huntington 2019-03-15 21:10:40 -07:00
parent 0f9def059a
commit f569b82460
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/System/Plugins/Consts.hs
View File

@ -20,7 +20,7 @@
module System.Plugins.Consts where
#include "../../../config.h"
#include "config.h"
#if __GLASGOW_HASKELL__ >= 604

7
src/System/Plugins/Env.hs
View File

@ -50,7 +50,7 @@ module System.Plugins.Env (
) where
#include "../../../config.h"
#include "config.h"
import System.Plugins.LoadTypes (Module)
import System.Plugins.Consts ( sysPkgSuffix )
@ -76,7 +76,7 @@ import DynFlags (
Way(WayDyn), dynamicGhc, ways,
#endif
defaultDynFlags, initDynFlags)
import SysTools (initSysTools)
import SysTools (initSysTools, initLlvmConfig)
import Distribution.Package hiding (
#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
-- real packages.
settings <- initSysTools (Just libdir)
dflags <- initDynFlags $ defaultDynFlags settings
llvmConfig <- initLlvmConfig (Just libdir)
dflags <- initDynFlags $ defaultDynFlags settings llvmConfig
libs <- mapM (findHSlib
#if MIN_VERSION_ghc(7,8,0)
(WayDyn `elem` ways dflags || dynamicGhc)

7
src/System/Plugins/Load.hs
View File

@ -61,7 +61,7 @@ module System.Plugins.Load (
) where
#include "../../../config.h"
#include "config.h"
import System.Plugins.Make ( build )
import System.Plugins.Env
@ -104,7 +104,7 @@ import GHC ( defaultCallbacks )
#else
import DynFlags (defaultDynFlags, initDynFlags)
import GHC.Paths (libdir)
import SysTools (initSysTools)
import SysTools (initSysTools, initLlvmConfig)
#endif
import GHC.Ptr ( Ptr(..), nullPtr )
#if !MIN_VERSION_ghc(7,4,1)
@ -127,7 +127,8 @@ readBinIface' hi_path = do
-- kludgy as hell
#if MIN_VERSION_ghc(7,2,0)
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
#else
e <- newHscEnv defaultCallbacks undefined

2
src/System/Plugins/Parser.hs
View File

@ -25,7 +25,7 @@ module System.Plugins.Parser (
replaceModName
) where
#include "../../../config.h"
#include "config.h"
import Data.List
import Data.Char

7
src/System/Plugins/Utils.hs
View File

@ -58,7 +58,7 @@ module System.Plugins.Utils (
) where
#include "../../../config.h"
#include "config.h"
import System.Plugins.Env ( isLoaded )
import System.Plugins.Consts ( objSuf, hiSuf, tmpDir )
@ -289,7 +289,7 @@ findFile (ext:exts) file
infixr 6 </>
infixr 6 <.>
(</>), (<.>), (<+>), (<>) :: FilePath -> FilePath -> FilePath
(</>), (<.>), (<+>) :: FilePath -> FilePath -> FilePath
[] </> b = b
a </> b = a ++ "/" ++ b
@ -299,9 +299,6 @@ a <.> b = a ++ "." ++ b
[] <+> b = b
a <+> b = a ++ " " ++ b
[] <> b = b
a <> b = a ++ b
--
-- | dirname : return the directory portion of a file path
-- if null, return "."