Commit 3ee7b541 authored by Pavel Zakopaylo's avatar Pavel Zakopaylo

Re-added some hard-coded paths to potentially fix CI issues

parent e1854613
Pipeline #490 failed with stages
...@@ -71,7 +71,8 @@ compileLibraryFiles (packageKey, files, extraFlags) = do ...@@ -71,7 +71,8 @@ compileLibraryFiles (packageKey, files, extraFlags) = do
libconfig = compilerConfig libconfig = compilerConfig
{ cfgGhcFlags = { cfgGhcFlags =
[ "-this-unit-id", packageKey, "-ddump-stg", "-ddump-to-file" [ "-this-unit-id", packageKey, "-ddump-stg", "-ddump-to-file"
, "-I/home/pavel/Development/mu/mu-client-ghc/libraries/base/include"] , "-I/home/pavel/Development/mu/mu-client-ghc/libraries/base/include"
, "-I/Users/nathan/projects/microvm/anuhc/libraries/include/"]
++ extraFlags ++ extraFlags
} }
...@@ -102,9 +103,13 @@ doResults liveObjectNames (defns, topClosures, mainFunction) = do ...@@ -102,9 +103,13 @@ doResults liveObjectNames (defns, topClosures, mainFunction) = do
libraryFiles :: [(String, [FilePath], [String])] libraryFiles :: [(String, [FilePath], [String])]
libraryFiles = [ ("ghc-prim", prefix ghcPrimFiles, []) libraryFiles = [ ("ghc-prim", prefix ghcPrimFiles, [])
, ("base", prefix baseFiles, ["-I/home/pavel/Development/mu/mu-client-ghc/libraries/base/include", "-i/home/pavel/Development/mu/mu-client-ghc/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"])
, ("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"])
, ("base", prefix' baseFiles, ["-I/Users/nathan/projects/microvm/anuhc/libraries/base/include/", "-i/Users/nathan/projects/microvm/anuhc/libraries/base"])
] ]
where where
prefix = fmap ("/home/pavel/Development/mu/mu-client-ghc/libraries/base" ++) prefix = fmap ("/home/pavel/Development/mu/mu-client-ghc/libraries/base" ++)
prefix' = fmap ("/Users/nathan/projects/microvm/anuhc/libraries/" ++)
ghcPrimFiles = ghcPrimFiles =
[ "ghc-prim/GHC/CString.hs" [ "ghc-prim/GHC/CString.hs"
, "ghc-prim/GHC/Classes.hs" , "ghc-prim/GHC/Classes.hs"
......
...@@ -28,5 +28,6 @@ extra-package-dbs: [] ...@@ -28,5 +28,6 @@ extra-package-dbs: []
# #
extra-lib-dirs: extra-lib-dirs:
- '/home/pavel/Development/mu/mu-impl-ref2/cbinding/' - '/home/pavel/Development/mu/mu-impl-ref2/cbinding/'
- '/Users/nathan/projects/microvm/haskell_libraries/mu-impl-ref2/cbinding/'
# compiler-check: newer-minor # 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