Merge branch 'post-05' into post-06

This commit is contained in:
Philipp Oppermann
2019-04-06 17:35:17 +02:00
2 changed files with 2 additions and 2 deletions

View File

@@ -79,7 +79,7 @@ before_test:
# Fix undefined references to __acrt_iob_func()
- sed -rie "s/#define std([[:alpha:]]+)[[:space:]]+\(__acrt_iob_func\(([[:digit:]]+)\)\)/#define std\1 (\&__iob_func()[\2])/" "C:\msys64\mingw64\x86_64-w64-mingw32\include\stdio.h"
- sed -rie "s/#define std([[:alpha:]]+)[[:space:]]+\(__acrt_iob_func\(([[:digit:]]+)\)\)/#define std\1 (\&__iob_func()[\2])/" "C:\msys64\mingw32\i686-w64-mingw32\include\stdio.h"
- rustup component add rust-src
- rustup component add rust-src llvm-tools-preview
- set RUST_BACKTRACE=1
- if not exist %USERPROFILE%\.cargo\bin\cargo-install-latest.exe cargo install cargo-install-latest
- cargo install-latest cargo-xbuild bootimage

View File

@@ -41,7 +41,7 @@ install:
- if [ $TRAVIS_OS_NAME = windows ]; then choco install qemu; export PATH="/c/Program Files/qemu:$PATH"; fi
before_script:
- rustup component add rust-src
- rustup component add rust-src llvm-tools-preview
- (test -x $HOME/.cargo/bin/cargo-install-latest || cargo install cargo-install-latest)
- cargo install-latest cargo-xbuild bootimage cargo-cache