From 12a3c213f4dc4f917c553b55e3448fed2b697371 Mon Sep 17 00:00:00 2001
From: Joe Richey <joerichey@google.com>
Date: Fri, 2 Oct 2020 02:02:12 -0700
Subject: [PATCH] CI: Remove all references to cargo-xbuild

Also, make sure that the debug build also works.

Signed-off-by: Joe Richey <joerichey@google.com>
---
 .travis.yml              | 6 +++---
 README.md                | 2 +-
 run_integration_tests.sh | 5 +----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index baa68362..6fe68f57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,15 +14,15 @@ install:
   - rustup component add clippy
   - rustup component add rustfmt
   - rustup component add rust-src
-  - cargo install cargo-xbuild
   - sudo apt-get install -y mtools
   - wget https://download.clearlinux.org/releases/28660/clear/clear-28660-kvm.img.xz
   - unxz clear-28660-kvm.img.xz
   - ./make-test-disks.sh
 
 script:
-  - cargo xbuild --release --target target.json
-  - cargo xclippy --target target.json
+  - cargo build --target target.json -Zbuild-std=core -Zbuild-std-features=compiler-builtins-mem
+  - cargo build --release --target target.json -Zbuild-std=core -Zbuild-std-features=compiler-builtins-mem
+  - cargo clippy --target target.json -Zbuild-std=core
   - cargo clippy --all-targets --all-features
   - cargo fmt --all -- --check
   - cargo test
diff --git a/README.md b/README.md
index c18a8261..65b966d6 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ all the way into the OS.
 
 To compile:
 
-cargo xbuild --release --target target.json
+cargo build --release --target target.json -Zbuild-std=core -Zbuild-std-features=compiler-builtins-mem
 
 The result will be in:
 
diff --git a/run_integration_tests.sh b/run_integration_tests.sh
index bbc85221..3a2482f3 100755
--- a/run_integration_tests.sh
+++ b/run_integration_tests.sh
@@ -3,11 +3,8 @@ set -xeuf
 
 source "${CARGO_HOME:-$HOME/.cargo}/env"
 
-XBUILD_VERSION="0.6.2"
-cargo install cargo-xbuild --version $XBUILD_VERSION
-
 rustup component add rust-src
-cargo xbuild --release --target target.json
+cargo build --release --target target.json -Zbuild-std=core -Zbuild-std-features=compiler-builtins-mem
 
 CH_VERSION="v0.8.0"
 CH_URL="https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/$CH_VERSION/cloud-hypervisor"