Skip to content

Commit

Permalink
Revert "Attempt Windows toolchain build"
Browse files Browse the repository at this point in the history
This reverts commit 63a716b.
  • Loading branch information
will-v-pi committed Aug 30, 2024
1 parent 63a716b commit 7fca792
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 41 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ jobs:
bin/picotool-*-x64-win.zip
bin/pico-sdk-tools-*-x64-win.zip
bin/openocd-*-x64-win.zip
bin/riscv-toolchain-*-x64-win.zip
- name: Add Release Asset
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
Expand All @@ -36,7 +35,6 @@ jobs:
bin/picotool-*-x64-win.zip
bin/pico-sdk-tools-*-x64-win.zip
bin/openocd-*-x64-win.zip
bin/riscv-toolchain-*-x64-win.zip
build_macos:
name: Build MacOS
Expand Down
21 changes: 1 addition & 20 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -235,16 +235,8 @@ if (-not $SkipDownload) {
msys 'pacman --noconfirm -Suu'

msys "pacman -S --noconfirm --needed autoconf automake git libtool make pactoys pkg-config wget"
# Risc-V requirements
# base-devel minus texinfo
msys "pacman -S --noconfirm --needed base binutils bison diffstat diffutils dos2unix file flex gawk gettext grep make patch sed tar"
msys "pacman -S --noconfirm --needed curl python3 gmp gperf patchutils expat"
# pacboy adds MINGW_PACKAGE_PREFIX to package names suffixed with :p
msys "pacboy -S --noconfirm --needed cmake:p ninja:p toolchain:p libusb:p hidapi:p libslirp:p mpc:p bc:p zlib:p mpfr:p"
}

if (-not (Test-Path ".\build\riscv-install\mingw$bitness")) {
msys "cd build && ../packages/windows/riscv/build-riscv-gcc.sh $bitness $mingw_arch"
msys "pacboy -S --noconfirm --needed cmake:p ninja:p toolchain:p libusb:p hidapi:p"
}

if (-not (Test-Path ".\build\openocd-install\mingw$bitness")) {
Expand Down Expand Up @@ -305,14 +297,3 @@ $filename = 'openocd-{0}-{1}.zip' -f

Write-Host "Saving OpenOCD package to $filename"
exec { tar -a -cf "bin\$filename" -C "build\openocd-install\mingw$bitness\bin" * -C "..\share\openocd" "scripts" }

# Package Risc-V separately as well

$version = "14"

$filename = 'riscv-toolchain-{0}-{1}.zip' -f
$version,
$suffix

Write-Host "Saving Risc-V toolchain package to $filename"
exec { tar -a -cf "bin\$filename" -C "build\riscv-install" * }
19 changes: 0 additions & 19 deletions packages/windows/riscv/build-riscv-gcc.sh

This file was deleted.

0 comments on commit 7fca792

Please sign in to comment.