diff options
| author | Ralf Jung <post@ralfj.de> | 2017-09-06 10:15:28 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2017-09-06 10:15:28 +0200 |
| commit | 2ee999b2cacf0ec9f7abf5615c4a7acd7938d7dd (patch) | |
| tree | a12fcc285b6939e8d4ebd12f21273e67b9d14f59 | |
| parent | 59cbfdbf0852c394a1a1cac9eece8db65a39e446 (diff) | |
| download | rust-2ee999b2cacf0ec9f7abf5615c4a7acd7938d7dd.tar.gz rust-2ee999b2cacf0ec9f7abf5615c4a7acd7938d7dd.zip | |
use latest xargo; this fixes the libstd build problem
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | xargo/build.sh | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 43858eec571..5f4724a89e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ before_script: - rustup target add i686-pc-windows-gnu - rustup target add i686-pc-windows-msvc - rustup component add rust-src -- cargo install xargo +- cargo install --git https://github.com/japaric/xargo.git - export RUST_SYSROOT=$HOME/rust script: - set -e diff --git a/xargo/build.sh b/xargo/build.sh index b842c04ae09..15a7c770910 100755 --- a/xargo/build.sh +++ b/xargo/build.sh @@ -1,4 +1,3 @@ #!/bin/sh cd "$(dirname "$0")" -sed 's/gcc = "0\.3\.50"/gcc = "=0\.3\.50"/' -i ~/.rustup/toolchains/*/lib/rustlib/src/rust/src/libstd/Cargo.toml RUSTFLAGS='-Zalways-encode-mir -Zmir-emit-validate=1' xargo build |