diff options
| author | stijn <stijn@ignitron.net> | 2016-09-09 16:14:16 +0200 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2016-09-10 10:15:30 +1000 |
| commit | dd0e6ddfeb8fe07eb6164f8ca51dc83da355fb3e (patch) | |
| tree | 1a294ec2d52466c411072a4f33c39724986a7074 | |
| parent | d14d4cdb8bc55b5937014f7a63932fdc1c50fdb0 (diff) | |
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 https://github.com/micropython/micropython/pull/2399)
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 99d8b8f0f..8f164598e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_script: - sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded - sudo dpkg --add-architecture i386 - sudo apt-get update -qq || true - - sudo apt-get install -y python3 gcc-multilib pkg-config libffi-dev libffi-dev:i386 qemu-system mingw32 + - sudo apt-get install -y python3 gcc-multilib pkg-config libffi-dev libffi-dev:i386 qemu-system gcc-mingw-w64 - sudo apt-get install -y --force-yes gcc-arm-none-eabi # For teensy build - sudo apt-get install realpath @@ -36,7 +36,7 @@ script: - make -C teensy - make -C cc3200 BTARGET=application BTYPE=release - make -C cc3200 BTARGET=bootloader BTYPE=release - - make -C windows CROSS_COMPILE=i586-mingw32msvc- + - make -C windows CROSS_COMPILE=i686-w64-mingw32- # run tests without coverage info #- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests) |