--- CTestConfig.cmake	2024-07-12 22:23:22.000000000 +0800
+++ CTestConfig.cmake	2026-04-22 23:25:08.000000000 +0800
@@ -22,12 +22,8 @@
 
   set(BUILDNAME "${CMAKE_SYSTEM_NAME}")
 
-  # Add i386 or amd64
-  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(BUILDNAME "${BUILDNAME}-amd64")
-  else()
-    set(BUILDNAME "${BUILDNAME}-i386")
-  endif()
+  # Add arch
+  set(BUILDNAME "${BUILDNAME}-@ARCH@")
 
   # Add compiler name
   get_filename_component(CMAKE_C_COMPILER_NAME ${CMAKE_C_COMPILER} NAME)