fix target

anoma · Apr 15, 2024 · afb002e · afb002e
1 parent 0b1b4e5
commit afb002e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/app/Commands/Dev/Tree/Compile/Native.hs b/app/Commands/Dev/Tree/Compile/Native.hs
@@ -10,5 +10,11 @@ runCommand ::
   NativeOptions ('InputExtension 'FileExtJuvixTree) ->
   Sem r ()
 runCommand opts =
-  TreeToC.treeToC (opts ^. nativeCompileCommonOptions)
+  TreeToC.treeToC treeToCArgs
     >>= Helper.fromC (nativeHelperOptions opts)
+  where
+    treeToCArgs =
+      TreeToC.TreeToCArgs
+        { _treeToCTarget = TargetCNative64,
+          _treeToCCommonOptions = (opts ^. nativeCompileCommonOptions)
+        }
diff --git a/app/Commands/Dev/Tree/Compile/TreeToC.hs b/app/Commands/Dev/Tree/Compile/TreeToC.hs
@@ -5,15 +5,27 @@ import Commands.Compile.CommonOptions
 import Juvix.Compiler.Backend.C
 import Juvix.Compiler.Tree.Translation.FromSource qualified as Tree
 
+data TreeToCArgs = TreeToCArgs
+  { _treeToCTarget :: Target,
+    _treeToCCommonOptions :: CompileCommonOptions ('InputExtension 'FileExtJuvixTree)
+  }
+
+makeLenses ''TreeToCArgs
+
+instance EntryPointOptions TreeToCArgs where
+  applyOptions opts =
+    set entryPointTarget (Just (opts ^. treeToCTarget))
+      . applyOptions (opts ^. treeToCCommonOptions)
+
 treeToC ::
   forall r.
   (Members '[EmbedIO, App, TaggedLock] r) =>
-  CompileCommonOptions ('InputExtension 'FileExtJuvixTree) ->
+  TreeToCArgs ->
   Sem r MiniCResult
 treeToC opts = do
   afile <-
     getMainAppFileFromInputFileType @('InputExtension 'FileExtJuvixTree)
-      (opts ^. compileInputFile)
+      (opts ^. treeToCCommonOptions . compileInputFile)
   file <- fromAppPathFile afile
   s <- readFile file
   tab <- getRight (mapLeft JuvixError (Tree.runParser file s))

diff --git a/app/Commands/Dev/Tree/Compile/Wasi.hs b/app/Commands/Dev/Tree/Compile/Wasi.hs
@@ -11,4 +11,11 @@ runCommand ::
   WasiOptions ('InputExtension 'FileExtJuvixTree) ->
   Sem r ()
 runCommand opts =
-  TreeToC.treeToC (opts ^. wasiCompileCommonOptions) >>= Helper.fromC (wasiHelperOptions opts)
+  TreeToC.treeToC treeToCArgs
+    >>= Helper.fromC (wasiHelperOptions opts)
+  where
+    treeToCArgs =
+      TreeToC.TreeToCArgs
+        { _treeToCTarget = TargetCNative64,
+          _treeToCCommonOptions = (opts ^. wasiCompileCommonOptions)
+        }