1 files changed, 2 insertions, 17 deletions
diff --git a/src/debug/daccess/CMakeLists.txt b/src/debug/daccess/CMakeLists.txt
index f5dbbefff8..6b459b89b4 100644
--- a/src/debug/daccess/CMakeLists.txt
+++ b/src/debug/daccess/CMakeLists.txt
@@ -60,25 +60,10 @@ set(DACCESS_SOURCES
   datatargetadapter.cpp
 )
 
-if(CLR_CMAKE_PLATFORM_ARCH_AMD64)
-  include_directories(amd64)
-
-  list(APPEND DACCESS_SOURCES
-    amd64/primitives.cpp
-  )
-elseif(CLR_CMAKE_PLATFORM_ARCH_ARM)
-  include_directories(arm)
-
+include_directories(${ARCH_SOURCES_DIR})
   list(APPEND DACCESS_SOURCES
-    arm/primitives.cpp
+    ${ARCH_SOURCES_DIR}/primitives.cpp
   )
-elseif(CLR_CMAKE_PLATFORM_ARCH_I386)
-  include_directories(i386)
-
-  list(APPEND DACCESS_SOURCES
-    i386/primitives.cpp
-  )
-endif()
 
 convert_to_absolute_path(DACCESS_SOURCES ${DACCESS_SOURCES})