Simplify calling cargo in Shake

bittide · Aug 18, 2023 · 97ca442 · 97ca442
1 parent 59694a9
commit 97ca442
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 51 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
@@ -202,7 +201,7 @@ shakeOpts :: ShakeOptions
 shakeOpts = shakeOptions
   { shakeFiles = buildDir
   , shakeChange = ChangeDigest
-  , shakeVersion = "8"
+  , shakeVersion = "9"
   }
 
 -- | Run Vivado on given TCL script
@@ -333,7 +332,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/bittide-shake.cabal b/bittide-shake/bittide-shake.cabal
@@ -97,7 +97,6 @@ library
   import: common-options
   hs-source-dirs: src
   exposed-modules:
-    Clash.Shake.Cargo
     Clash.Shake.Extra
     Clash.Shake.Flags
     Clash.Shake.Vivado

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