diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebb737df3..600486065 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,6 +187,9 @@ if (WITH_RPCSX)
 endif()
 
 if (WITH_RPCS3)
+    include(ConfigureCompiler)
+    include(CheckFunctionExists)
+
     add_subdirectory(rpcs3)
     add_subdirectory(ps3fw)
 endif()
diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index 0f6d9462f..f062e405f 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -9,7 +9,7 @@ set(LLVM_VERSION 19.1)
 
 option(USE_ARCH "Specify arch to build" "")
 
-if (NOT USE_ARCH STREQUAL "")
+if (USE_ARCH)
     add_compile_options(-march=${USE_ARCH})
 endif()
 
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 159789ee0..e7a9fb3ab 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -30,7 +30,7 @@ else()
 	endif()
 
 	add_compile_options(-Wall)
-	# add_compile_options(-fno-exceptions)
+	add_compile_options(-fno-exceptions)
 	add_compile_options(-fstack-protector)
 
 	if(USE_NATIVE_INSTRUCTIONS AND COMPILER_SUPPORTS_MARCH_NATIVE)