Skip to content

Commit dd0e6dd

Browse files
stinosdpgeorge
stinos
authored and
dpgeorge
committed
travis: Abandon mingw32 in favour of mingw-w64
This is actually long overdue: the README in the windows directory has been updated once to indicate mingw32 is abandoned and not ok to use with uPy, but we forgot travis builds were still using it. As a bonus the travis build will succeed again since moduerrno.c now compiles. (see micropython#2399)
1 parent d14d4cd commit dd0e6dd

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ before_script:
1212
- sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded
1313
- sudo dpkg --add-architecture i386
1414
- sudo apt-get update -qq || true
15-
- sudo apt-get install -y python3 gcc-multilib pkg-config libffi-dev libffi-dev:i386 qemu-system mingw32
15+
- sudo apt-get install -y python3 gcc-multilib pkg-config libffi-dev libffi-dev:i386 qemu-system gcc-mingw-w64
1616
- sudo apt-get install -y --force-yes gcc-arm-none-eabi
1717
# For teensy build
1818
- sudo apt-get install realpath
@@ -36,7 +36,7 @@ script:
3636
- make -C teensy
3737
- make -C cc3200 BTARGET=application BTYPE=release
3838
- make -C cc3200 BTARGET=bootloader BTYPE=release
39-
- make -C windows CROSS_COMPILE=i586-mingw32msvc-
39+
- make -C windows CROSS_COMPILE=i686-w64-mingw32-
4040

4141
# run tests without coverage info
4242
#- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests)

0 commit comments

Comments
 (0)