From 4d7fa243c63ef620ad704d887c50d1f2e5eee8c3 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Sat, 25 Nov 2017 13:56:29 -0800
Subject: [PATCH 1/3] Fix the FreeBSD target

It wasn't expecting a `*.d` file to exist, now it does.
---
 ci/run.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ci/run.sh b/ci/run.sh
index 420542a5..02dd35a1 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -41,7 +41,11 @@ if [ "$QEMU" != "" ]; then
 
   # Do the standard rigamarole of cross-compiling an executable and then the
   # script to run just executes the binary.
-  cargo build --manifest-path libc-test/Cargo.toml --target $TARGET --tests
+  cargo build \
+    --manifest-path libc-test/Cargo.toml \
+    --target $TARGET \
+    --test main
+  rm $CARGO_TARGET_DIR/$TARGET/debug/main-*.d
   cp $CARGO_TARGET_DIR/$TARGET/debug/main-* $tmpdir/mount/libc-test
   echo 'exec $1/libc-test' > $tmpdir/mount/run.sh
 

From 69784400541af37e183674f07ebaf662eb479d55 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Sat, 25 Nov 2017 14:09:22 -0800
Subject: [PATCH 2/3] Fix wasm tests

Looks like `cargo test` is now trying to test too many files due to
rust-lang/cargo#4750 so add a clause to the wrapper to ignore the bogus ones for
now
---
 ci/docker/wasm32-unknown-emscripten/node-wrapper.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ci/docker/wasm32-unknown-emscripten/node-wrapper.sh b/ci/docker/wasm32-unknown-emscripten/node-wrapper.sh
index b1936f04..3122e2e2 100755
--- a/ci/docker/wasm32-unknown-emscripten/node-wrapper.sh
+++ b/ci/docker/wasm32-unknown-emscripten/node-wrapper.sh
@@ -7,5 +7,9 @@ shift
 dir=$(dirname $me)
 file=$(basename $me)
 
+if echo $file | grep -q wasm; then
+  exit 0 # FIXME(rust-lang/cargo#4750)
+fi
+
 cd $dir
 exec node $file "$@"

From bea4879eec9a11d7ca6baa66aabed870d28501e0 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Sat, 25 Nov 2017 14:17:54 -0800
Subject: [PATCH 3/3] Pin aarch64 musl to 1.22.0

Apparently it fails on 1.23.0 for mysterious reasons
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 053abfe1..6acf0a80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,7 +53,8 @@ matrix:
     - env: TARGET=arm-unknown-linux-musleabihf
     - env: TARGET=aarch64-unknown-linux-gnu
     - env: TARGET=aarch64-unknown-linux-musl
-      rust: beta
+      # FIXME(#856)
+      rust: 1.22.1
     - os: osx
       osx_image: xcode8.2
       env: TARGET=i386-apple-ios