Skip to content

Commit 41e27fe

Browse files
committed
Use -cpu n270 to run i686-linux-android tests
After the ndk update used to build libstd rust-lang/rust#45580, i686-linux-android binaries stopped working #143. It's seem that the new toolchain is emitting instructions that the default qemu-i386 cpu does not support. Using -cpu n270 (common in android i686 phones), fix the problem. Fixes #143.
1 parent c32c3a6 commit 41e27fe

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ matrix:
3030
- env: TARGET=aarch64-linux-android CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
3131
- env: TARGET=arm-linux-androideabi CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
3232
- env: TARGET=armv7-linux-androideabi CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
33-
# NOTE RUN=1 missing due to issue #143
34-
- env: TARGET=i686-linux-android CPP=1 STD=1 OPENSSL=0.5.5
33+
- env: TARGET=i686-linux-android CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
3534
- env: TARGET=x86_64-linux-android CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
3635

3736
# OSX

docker/i686-linux-android/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN bash /android-system.sh x86
3636
# Libz is distributed in the android ndk, but for some unknown reason it is not
3737
# found in the build process of some crates, so we explicit set the DEP_Z_ROOT
3838
ENV CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-gcc \
39-
CARGO_TARGET_I686_LINUX_ANDROID_RUNNER=qemu-i386 \
39+
CARGO_TARGET_I686_LINUX_ANDROID_RUNNER="qemu-i386 -cpu n270" \
4040
CC_i686_linux_android=i686-linux-android-gcc \
4141
CXX_i686_linux_android=i686-linux-android-g++ \
4242
DEP_Z_ROOT=/android-ndk/sysroot/usr/ \

0 commit comments

Comments
 (0)