Simplify calling cargo in Shake

bittide · Aug 18, 2023 · 743f018 · 743f018
1 parent 4590337
commit 743f018
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 49 deletions.
diff --git a/bittide-shake/bin/Shake.hs b/bittide-shake/bin/Shake.hs
@@ -23,7 +23,6 @@ import System.Process (readProcess, callProcess)
 
 import Paths_bittide_shake
 
-import Clash.Shake.Cargo
 import Clash.Shake.Extra
 import Clash.Shake.Flags
 import Clash.Shake.Vivado
@@ -334,7 +333,8 @@ main = do
 
               -- We build all rust binaries in "firmware-binaries". They are required to
               -- build bittide-instance because we have instances that includes a binaries.
-              liftIO $ cargoBuildFirmwareProgram "firmware-binaries" Release
+              command_ [Cwd "firmware-binaries"] "cargo" ["build", "--release"]
+
               let
                 (buildTool, buildToolArgs) =
                   defaultClashCmd clashBuildDir targetName

diff --git a/bittide-shake/src/Clash/Shake/Cargo.hs b/bittide-shake/src/Clash/Shake/Cargo.hs