Commit 98d5999f authored by Pavel Zakopaylo's avatar Pavel Zakopaylo

Modified hard-coded paths

This just changes them from pointing to Nathan's home directory to
pointing to mine. Ideally we can find a way to get rid of them
entirely.
parent 4e3377a2
......@@ -50,7 +50,7 @@ main :: IO ()
main = do
inputFiles <- getArgs
b <- GHC.Simple.compileWith compilerConfig compileMu inputFiles
libresults <- return [] -- mapM compileLibraryFiles libraryFiles
libresults <- mapM compileLibraryFiles libraryFiles
case b of
Success results _ _ -> do
doResults lives $ mergeResults $ (loadPrim : concat libresults ++ results')
......@@ -71,7 +71,7 @@ compileLibraryFiles (packageKey, files, extraFlags) = do
libconfig = compilerConfig
{ cfgGhcFlags =
[ "-this-unit-id", packageKey, "-ddump-stg", "-ddump-to-file"
, "-I/Users/nathan/projects/microvm/anuhc/libraries/include/"]
, "-I/home/pavel/Development/mu/mu-client-ghc/libraries/base/include"]
++ extraFlags
}
......@@ -101,10 +101,10 @@ doResults liveObjectNames (defns, topClosures, mainFunction) = do
-- TODO: fix this.
libraryFiles :: [(String, [FilePath], [String])]
libraryFiles = [ ("ghc-prim", prefix ghcPrimFiles, [])
, ("base", prefix baseFiles, ["-I/Users/nathan/projects/microvm/anuhc/libraries/base/include/", "-i/Users/nathan/projects/microvm/anuhc/libraries/base"])
, ("base", prefix baseFiles, ["-I/home/pavel/Development/mu/mu-client-ghc/libraries/base/include", "-i/home/pavel/Development/mu/mu-client-ghc/libraries/base"])
]
where
prefix = fmap ("/Users/nathan/projects/microvm/anuhc/libraries/" ++)
prefix = fmap ("/home/pavel/Development/mu/mu-client-ghc/libraries/base" ++)
ghcPrimFiles =
[ "ghc-prim/GHC/CString.hs"
, "ghc-prim/GHC/Classes.hs"
......
......@@ -140,7 +140,6 @@ type MuResult = (Seq Definition, Seq TopLevel, Maybe FunctionName)
type MuMergedResult = ( Map Name Definition
, Map Name TopLevel
, Maybe FunctionName)
mergeResults :: [MuResult] -> MuMergedResult
mergeResults = foldl' mergeResults' (M.empty, M.empty, Nothing)
where
......
......@@ -27,6 +27,6 @@ extra-package-dbs: []
# extra-include-dirs: [/path/to/dir]
#
extra-lib-dirs:
- '/Users/nathan/projects/microvm/haskell_libraries/mu-impl-ref2/cbinding/'
- '/home/pavel/Development/mu/mu-impl-ref2/cbinding/'
# compiler-check: newer-minor
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment