diff options
author | Bryant Mairs <bryant@mai.rs> | 2017-08-21 08:31:33 -0700 |
---|---|---|
committer | Bryant Mairs <bryant@mai.rs> | 2017-08-21 10:46:26 -0700 |
commit | 362134d8d60dffdd039dee39b536a31b5c0c98db (patch) | |
tree | e137e4d31cb26710ac66cb23c2d3543b0451f5e3 /ci/run.sh | |
parent | 2e11d9e14ce1a2cf0353363e4239a9d1fa147694 (diff) | |
download | rust-libc-362134d8d60dffdd039dee39b536a31b5c0c98db.tar.gz |
Simplify iOS builds by using Cargo's RUSTFLAGS support
Diffstat (limited to 'ci/run.sh')
-rwxr-xr-x | ci/run.sh | 17 |
1 files changed, 5 insertions, 12 deletions
@@ -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 |