Skip to content

Commit 950a141

Browse files
committed
Fix Android’s CPU features
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.
1 parent 4fb4fc1 commit 950a141

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

docker/Dockerfile.x86_64-linux-android

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
2222
# Libz is distributed in the android ndk, but for some unknown reason it is not
2323
# found in the build process of some crates, so we explicit set the DEP_Z_ROOT
2424
ENV CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android-gcc \
25-
CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER="qemu-x86_64 -cpu Penryn" \
25+
CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER="qemu-x86_64 -cpu qemu64,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+popcnt" \
2626
CC_x86_64_linux_android=x86_64-linux-android-gcc \
2727
CXX_x86_64_linux_android=x86_64-linux-android-g++ \
2828
DEP_Z_INCLUDE=/android-ndk/sysroot/usr/include/ \

0 commit comments

Comments
 (0)