From 460d3f05a2508c53ffbed63aaa9583b02f9549bd Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Mon, 8 Oct 2018 19:46:07 +0200
Subject: [PATCH] Mention xargo in Readme.md and fix travis

---
 .travis.yml | 1 +
 Readme.md   | 1 +
 build.sh    | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 78ed95bb6a5..db9dbdcc259 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ rust:
 
 script:
   - rustup component add rust-src
+  - cargo install xargo || echo "Skipping xargo install"
   - ./prepare_libcore.sh
   - ./build.sh
 
diff --git a/Readme.md b/Readme.md
index 751a9ae3375..a305c2b5091 100644
--- a/Readme.md
+++ b/Readme.md
@@ -8,6 +8,7 @@
 $ git clone https://github.com/bjorn3/rustc_codegen_cranelift.git
 $ cd rustc_codegen_cranelift
 $ rustup override set nightly
+$ cargo install xargo
 $ git submodule update --init
 $ cargo build
 ```
diff --git a/build.sh b/build.sh
index ff3405aa8da..3d0e081f385 100755
--- a/build.sh
+++ b/build.sh
@@ -74,7 +74,7 @@ echo "[BUILD] core"
 time $RUSTC target/libcore/src/libcore/lib.rs --crate-type lib --crate-name core -Cincremental=target/incremental_core
 
 pushd xargo
-rm -r ~/.xargo/HOST
+rm -r ~/.xargo/HOST || true
 export XARGO_RUST_SRC=$(pwd)'/../target/libcore/src'
 time xargo build --color always
 rm -r target/