From 362134d8d60dffdd039dee39b536a31b5c0c98db Mon Sep 17 00:00:00 2001
From: Bryant Mairs <bryant@mai.rs>
Date: Mon, 21 Aug 2017 08:31:33 -0700
Subject: [PATCH] Simplify iOS builds by using Cargo's RUSTFLAGS support

---
 ci/run.sh | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/ci/run.sh b/ci/run.sh
index d9dddfa3..0d27a854 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -68,18 +68,11 @@ if [ "$QEMU" != "" ]; then
   exec grep "^PASSED .* tests" $CARGO_TARGET_DIR/out.log
 fi
 
-case "$TARGET" in
-  *-apple-ios)
-    cargo rustc --manifest-path libc-test/Cargo.toml --target $TARGET \
-        --test main -- -C link-args=-mios-simulator-version-min=7.0
-    cargo rustc --manifest-path libc-test/Cargo.toml --target $TARGET \
-        --test linux-fcntl -- -C link-args=-mios-simulator-version-min=7.0
-    ;;
-
-  *)
-    cargo build --manifest-path libc-test/Cargo.toml --target $TARGET --tests
-    ;;
-esac
+# Build all tests making sure that the iOS builds are handled properly.
+if [[ "$TARGET" == *-apple-ios ]]; then
+    export RUSTFLAGS="-C link-args=-mios-simulator-version-min=7.0"
+fi
+cargo build --manifest-path libc-test/Cargo.toml --target $TARGET --tests
 
 case "$TARGET" in
   # Android emulator for x86_64 does not work on travis (missing hardware
-- 
GitLab