diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 34882d14..60d5f2ef 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,7 +29,7 @@ if(BUILD_SHARED)
   endif(NOT ANDROID)
   if(ANDROID OR UNIX)
 	  # need to explicitly link to the math library because the CMake/Android toolchains may not do it automatically
-	  target_link_libraries(chipmunk m)
+	  target_link_libraries(chipmunk m log)
   endif(ANDROID OR UNIX)
   install(TARGETS chipmunk RUNTIME DESTINATION ${BIN_INSTALL_DIR}
                            LIBRARY DESTINATION ${LIB_INSTALL_DIR}
diff --git a/src/cpHastySpace.c b/src/cpHastySpace.c
index 8422c3eb..bd152549 100644
--- a/src/cpHastySpace.c
+++ b/src/cpHastySpace.c
@@ -231,10 +231,7 @@ int pthread_join(pthread_t thread, void **value_ptr)
 	#error Compiler not supported.
 #endif
 
-#if CP_USE_DOUBLES
-	#if !__arm64
-		#error Cannot use CP_USE_DOUBLES on 32 bit ARM.
-	#endif
+#if CP_USE_DOUBLES && __arm64
 	
 	typedef float64_t cpFloat_t;
 	typedef float64x2_t cpFloatx2_t;