Skip to content

Commit

Permalink
Fix Android’s CPU features
Browse files Browse the repository at this point in the history
The Android target uses CPU features such as +popcnt and +sse4.2 which
are not available on Penryn. List the used CPU exactly the same way as
it is listed in the Rust target.
  • Loading branch information
nagisa committed Oct 26, 2019
1 parent 4fb4fc1 commit 950a141
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docker/Dockerfile.x86_64-linux-android
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
# Libz is distributed in the android ndk, but for some unknown reason it is not
# found in the build process of some crates, so we explicit set the DEP_Z_ROOT
ENV CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android-gcc \
CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER="qemu-x86_64 -cpu Penryn" \
CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER="qemu-x86_64 -cpu qemu64,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+popcnt" \
CC_x86_64_linux_android=x86_64-linux-android-gcc \
CXX_x86_64_linux_android=x86_64-linux-android-g++ \
DEP_Z_INCLUDE=/android-ndk/sysroot/usr/include/ \
Expand Down

0 comments on commit 950a141

Please sign in to comment.