From 7ee37ca25c0a6e3848b283f3336ce538d158561d Mon Sep 17 00:00:00 2001
From: Taiki Endo <te316e89@gmail.com>
Date: Sun, 8 Sep 2019 23:08:44 +0900
Subject: [PATCH] Remove a patch for cross

---
 ci/azure-cross-compile.yml | 12 +-----------
 ci/cross-patch             | 22 ----------------------
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 ci/cross-patch

diff --git a/ci/azure-cross-compile.yml b/ci/azure-cross-compile.yml
index 62840f5..bddb59b 100644
--- a/ci/azure-cross-compile.yml
+++ b/ci/azure-cross-compile.yml
@@ -30,17 +30,7 @@ jobs:
       parameters:
         rust_version: ${{parameters.rust_version}}
 
-    # FIXME(taiki-e): When https://github.com/rust-embedded/cross/pull/169 is
-    # merged, switch to the installation from crates.io.
-    # See https://nbsoftsolutions.com/blog/azure-pipelines-for-rust-projects#workaround-cross-compilation
-    # for the current script.
-    - script: |
-        git clone https://github.com/rust-embedded/cross.git
-        cd cross
-        git reset --hard fb1cb1d7288151f4349f1cb4c990e0e2281764da #Is broken after this commit (images are not uploaded to new docker hub)
-        git apply ../ci/cross-patch
-        cargo install --path .
-        rm -rf cross
+    - script: cargo install cross
       displayName: Install cross
       condition: not(eq(variables['target'], 'wasm32-unknown-unknown'))
 
diff --git a/ci/cross-patch b/ci/cross-patch
deleted file mode 100644
index b1fb4ba..0000000
--- a/ci/cross-patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/docker.rs b/src/docker.rs
-index 6ea745d..15fef81 100644
---- a/src/docker.rs
-+++ b/src/docker.rs
-@@ -62,7 +62,7 @@ pub fn register(target: &Target, verbose: bool) -> Result<()> {
-     docker_command("run")
-         .arg("--privileged")
-         .arg("--rm")
--        .arg("-it")
-+        .arg("-i")
-         .arg("ubuntu:16.04")
-         .args(&["sh", "-c", cmd])
-         .run(verbose)
-@@ -160,7 +160,7 @@ pub fn run(target: &Target,
-         .args(&["-v", &format!("{}:/rust:Z,ro", sysroot.display())])
-         .args(&["-v", &format!("{}:/target:Z", target_dir.display())])
-         .args(&["-w", "/project"])
--        .args(&["-it", &image(toml, target)?])
-+        .args(&["-i", &image(toml, target)?])
-         .args(&["sh", "-c", &format!("PATH=$PATH:/rust/bin {:?}", cmd)])
-         .run_and_get_status(verbose)
- }