Skip to content

Commit 7fca792

Browse files
committed
Revert "Attempt Windows toolchain build"
This reverts commit 63a716b.
1 parent 63a716b commit 7fca792

File tree

3 files changed

+1
-41
lines changed

3 files changed

+1
-41
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ jobs:
2727
bin/picotool-*-x64-win.zip
2828
bin/pico-sdk-tools-*-x64-win.zip
2929
bin/openocd-*-x64-win.zip
30-
bin/riscv-toolchain-*-x64-win.zip
3130
- name: Add Release Asset
3231
uses: softprops/action-gh-release@v2
3332
if: startsWith(github.ref, 'refs/tags/')
@@ -36,7 +35,6 @@ jobs:
3635
bin/picotool-*-x64-win.zip
3736
bin/pico-sdk-tools-*-x64-win.zip
3837
bin/openocd-*-x64-win.zip
39-
bin/riscv-toolchain-*-x64-win.zip
4038
4139
build_macos:
4240
name: Build MacOS

build.ps1

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -235,16 +235,8 @@ if (-not $SkipDownload) {
235235
msys 'pacman --noconfirm -Suu'
236236

237237
msys "pacman -S --noconfirm --needed autoconf automake git libtool make pactoys pkg-config wget"
238-
# Risc-V requirements
239-
# base-devel minus texinfo
240-
msys "pacman -S --noconfirm --needed base binutils bison diffstat diffutils dos2unix file flex gawk gettext grep make patch sed tar"
241-
msys "pacman -S --noconfirm --needed curl python3 gmp gperf patchutils expat"
242238
# pacboy adds MINGW_PACKAGE_PREFIX to package names suffixed with :p
243-
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"
244-
}
245-
246-
if (-not (Test-Path ".\build\riscv-install\mingw$bitness")) {
247-
msys "cd build && ../packages/windows/riscv/build-riscv-gcc.sh $bitness $mingw_arch"
239+
msys "pacboy -S --noconfirm --needed cmake:p ninja:p toolchain:p libusb:p hidapi:p"
248240
}
249241

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

306298
Write-Host "Saving OpenOCD package to $filename"
307299
exec { tar -a -cf "bin\$filename" -C "build\openocd-install\mingw$bitness\bin" * -C "..\share\openocd" "scripts" }
308-
309-
# Package Risc-V separately as well
310-
311-
$version = "14"
312-
313-
$filename = 'riscv-toolchain-{0}-{1}.zip' -f
314-
$version,
315-
$suffix
316-
317-
Write-Host "Saving Risc-V toolchain package to $filename"
318-
exec { tar -a -cf "bin\$filename" -C "build\riscv-install" * }

packages/windows/riscv/build-riscv-gcc.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)