Use prebuild RISCV toolchain on macos

tum-ei-eda · Mar 2, 2022 · 10c391f · 10c391f
1 parent a2db42d
commit 10c391f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -187,8 +187,9 @@ jobs:
     # TODO: caching
     - name: Install SW dependencies
       run: |
-          brew tap riscv-software-src/riscv
-          brew install make ninja cmake boost coreutils gnu-sed riscv-tools
+          # brew tap riscv-software-src/riscv
+          # brew install make ninja cmake boost coreutils gnu-sed riscv-tools
+          brew install make ninja cmake boost coreutils gnu-sed dtc
           echo "/usr/local/opt/make/libexec/gnubin" >> $GITHUB_PATH
           echo "/usr/local/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
     - name: Initialize Virtualenv

diff --git a/templates/osx.yml.j2 b/templates/osx.yml.j2
@@ -150,7 +150,8 @@ vars:
   # riscv_gcc.dl_url: "https://syncandshare.lrz.de/dl/fi89JQF89pEiWwP6aQh7cM4H/rv32gcv.tar.xz"
   llvm.version: "13.0.1"
   llvm.distribution: "x86_64-apple-darwin"  # TODO: automatically figure this out during setup, let user specify url instead?
-  spike.exe: "/usr/local/Cellar/riscv-isa-sim/main/bin/spike"
-  spike.pk: "/usr/local/Cellar/riscv-pk/main/riscv64-unknown-elf/bin/pk"
-  riscv_gcc.install_dir: "/usr/local/Cellar/riscv-gnu-toolchain/main/"
-  riscv_gcc.name: "riscv64-unknown-elf"
+  # spike.exe: "/usr/local/Cellar/riscv-isa-sim/main/bin/spike"
+  # spike.pk: "/usr/local/Cellar/riscv-pk/main/riscv32-unknown-elf/bin/pk"
+  riscv_gcc.dl_url: "https://syncandshare.lrz.de/dl/fi6cG9jUGFkRY78ztqQzZRXh/rv32gc_osx.tar.xz"
+  # riscv_gcc.install_dir: "/usr/local/Cellar/riscv-gnu-toolchain/main/"
+  # riscv_gcc.name: "riscv32-unknown-elf"