Skip to content

Commit 362134d

Browse files
committed
Simplify iOS builds by using Cargo's RUSTFLAGS support
1 parent 2e11d9e commit 362134d

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

ci/run.sh

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,11 @@ if [ "$QEMU" != "" ]; then
6868
exec grep "^PASSED .* tests" $CARGO_TARGET_DIR/out.log
6969
fi
7070

71-
case "$TARGET" in
72-
*-apple-ios)
73-
cargo rustc --manifest-path libc-test/Cargo.toml --target $TARGET \
74-
--test main -- -C link-args=-mios-simulator-version-min=7.0
75-
cargo rustc --manifest-path libc-test/Cargo.toml --target $TARGET \
76-
--test linux-fcntl -- -C link-args=-mios-simulator-version-min=7.0
77-
;;
78-
79-
*)
80-
cargo build --manifest-path libc-test/Cargo.toml --target $TARGET --tests
81-
;;
82-
esac
71+
# Build all tests making sure that the iOS builds are handled properly.
72+
if [[ "$TARGET" == *-apple-ios ]]; then
73+
export RUSTFLAGS="-C link-args=-mios-simulator-version-min=7.0"
74+
fi
75+
cargo build --manifest-path libc-test/Cargo.toml --target $TARGET --tests
8376

8477
case "$TARGET" in
8578
# Android emulator for x86_64 does not work on travis (missing hardware

0 commit comments

Comments
 (0)