From 350fb4a596361d1980ffb04fb449ba69c5d5efdf Mon Sep 17 00:00:00 2001 From: Marshall Pierce Date: Thu, 19 Jan 2017 13:06:14 -0800 Subject: [PATCH] Exclude target_os=android from C GFp_cpuid_setup init --- src/init.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/init.rs b/src/init.rs index c6c02495f3..b335bf30fd 100644 --- a/src/init.rs +++ b/src/init.rs @@ -49,13 +49,15 @@ extern { // On other platforms (excluding iOS aarch64), use C feature detection. #[cfg(all(not(all(target_arch = "aarch64", target_os = "ios")), - not(all(any(target_arch = "arm", target_arch = "aarch64"), target_os = "linux"))))] + not(all(any(target_arch = "arm", target_arch = "aarch64"), + any(target_os = "linux", target_os = "android")))))] extern { fn GFp_cpuid_setup(); } #[cfg(all(not(all(target_arch = "aarch64", target_os = "ios")), - not(all(any(target_arch = "arm", target_arch = "aarch64"), target_os = "linux"))))] + not(all(any(target_arch = "arm", target_arch = "aarch64"), + any(target_os = "linux", target_os = "android")))))] fn set_cpu_features() { unsafe { GFp_cpuid_setup() } }