Moves walloc to a common directory

anoma · Jul 29, 2022 · 946c774 · 946c774
1 parent d3ee7b3
commit 946c774
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 477 deletions.
diff --git a/app/Commands/Compile.hs b/app/Commands/Compile.hs
@@ -120,11 +120,14 @@ prepareRuntime projRoot o = do
     builtinCRuntimeDir :: [(FilePath, BS.ByteString)]
     builtinCRuntimeDir = $(FE.makeRelativeToProject "minic-runtime/builtins" >>= FE.embedDir)
 
+    wallocDir :: [(FilePath, BS.ByteString)]
+    wallocDir = $(FE.makeRelativeToProject "minic-runtime/walloc" >>= FE.embedDir)
+
     runtimeProjectDir :: [(FilePath, BS.ByteString)]
     runtimeProjectDir = case o ^. compileRuntime of
-      RuntimeWasiStandalone -> wasiStandaloneRuntimeDir <> builtinCRuntimeDir
+      RuntimeWasiStandalone -> wasiStandaloneRuntimeDir <> builtinCRuntimeDir <> wallocDir
       RuntimeWasiLibC -> wasiLibCRuntimeDir <> builtinCRuntimeDir
-      RuntimeStandalone -> standaloneRuntimeDir <> builtinCRuntimeDir
+      RuntimeStandalone -> standaloneRuntimeDir <> builtinCRuntimeDir <> wallocDir
 
     writeRuntime :: (FilePath, BS.ByteString) -> IO ()
     writeRuntime (filePath, contents) =

diff --git a/minic-runtime/standalone/walloc.c → minic-runtime/walloc/walloc.c b/minic-runtime/standalone/walloc.c → minic-runtime/walloc/walloc.c