diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c38127dcc..144e77684e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,7 +144,7 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" ${EXT_DEFA
 
 cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "NOT ANDROID" OFF)
 
-cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT WIN32 AND NOT ARCHITECTURE_arm64" OFF)
+cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT WIN32 OR NOT ARCHITECTURE_arm64" OFF)
 mark_as_advanced(FORCE ENABLE_OPENGL)
 
 option(ENABLE_QT "Enable the Qt frontend" ON)
@@ -380,8 +380,6 @@ if (YUZU_USE_CPM)
     # boost
     set(BOOST_INCLUDE_LIBRARIES algorithm icl pool container heap asio headers process filesystem crc variant)
 
-    # TODO(crueter): Use the tar.gz or tar.xz ones since they use POSIX endings and
-    # makes patching easier.
     AddJsonPackage(boost)
 
     # really annoying thing where boost::headers doesn't work with cpm
diff --git a/CMakeModules/CPM.cmake b/CMakeModules/CPM.cmake
index f01a7a203e..3636ee5da0 100644
--- a/CMakeModules/CPM.cmake
+++ b/CMakeModules/CPM.cmake
@@ -592,7 +592,6 @@ function(cpm_add_patches)
       list(APPEND temp_list "&&")
     endif()
     # Add the patch command to the list
-    # use binary because DOS SUCKS
     list(APPEND temp_list "${PATCH_EXECUTABLE}" "-p1" "<" "${PATCH_FILE}")
   endforeach()
 
diff --git a/cpmfile.json b/cpmfile.json
index d6fb24cf83..e071e0a8b8 100644
--- a/cpmfile.json
+++ b/cpmfile.json
@@ -147,7 +147,8 @@
         "cmake_filename": "sdl2"
     },
     "llvm-mingw": {
-        "repo": "crueter/llvm-mingw",
+        "repo": "misc/llvm-mingw",
+        "git_host": "git.crueter.xyz",
         "tag": "20250828",
         "version": "20250828",
         "artifact": "clang-rt-builtins.tar.zst",
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ac685830cb..eb66e55964 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,10 +14,8 @@ if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64))
 endif()
 
 # CMake seems to only define _DEBUG on Windows
-if (NOT (MSVC AND CXX_CLANG))
-    set_property(DIRECTORY APPEND PROPERTY
-        COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG> $<$<NOT:$<CONFIG:Debug>>:NDEBUG>)
-endif()
+set_property(DIRECTORY APPEND PROPERTY
+    COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG> $<$<NOT:$<CONFIG:Debug>>:NDEBUG>)
 
 # Set compilation flags
 if (MSVC AND NOT CXX_CLANG)