diff --git a/configure.ac b/configure.ac
index fd30579c4b3..61382a61365 100644
--- a/configure.ac
+++ b/configure.ac
@@ -734,10 +734,10 @@ sse3_flags="-msse3"
 avx_flags="-mavx"
 CXXFLAGS="${save_cxxflags} ${sse3_flags}"
 CPPFLAGS="${save_cppflags} ${sse3_flags}"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([],)], [], [sse_flags=""])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],)], [], [sse_flags=""])
 CXXFLAGS="${save_cxxflags} ${avx_flags}"
 CPPFLAGS="${save_cppflags} ${avx_flags}"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([],)], [], [avx_flags=""])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],)], [], [avx_flags=""])
 CXXFLAGS="${save_cxxflags} ${sse3_flags}"
 CXXFLAGS="${save_cxxflags} ${sse3_flags}"
 AC_CHECK_HEADERS([intrin.h x86intrin.h pmmintrin.h xmmintrin.h emmintrin.h])
diff --git a/lib/diagnostics.cpp b/lib/diagnostics.cpp
index d92d0b6cf36..911b627b189 100644
--- a/lib/diagnostics.cpp
+++ b/lib/diagnostics.cpp
@@ -42,6 +42,10 @@
 #include "mac_backtrace.h"
 #endif
 
+#if defined(ANDROID) && __ANDROID_API__ < 33
+#undef HAVE_EXECINFO_H
+#endif
+
 #ifdef HAVE_EXECINFO_H
 #include <execinfo.h>
 #endif