Use ARCH_SOURCES_DIR consistently

Some places already use ARCH_SOURCES_DIR for things like include_directories but others test the platform/arch variables to figure out the dir. Use ARCH_SOURCES_DIR everywhere for consistency.

1 files changed, 5 insertions, 8 deletions

diff --git a/src/vm/crossgen/CMakeLists.txt b/src/vm/crossgen/CMakeLists.txt
index 5bed67918a..a1f1362346 100644
--- a/src/vm/crossgen/CMakeLists.txt
+++ b/src/vm/crossgen/CMakeLists.txt
@@ -105,27 +105,24 @@ endif(FEATURE_READYTORUN)
 
 include_directories(BEFORE ..)
 include_directories(${CLR_DIR}/src/gc)
+include_directories(../${ARCH_SOURCES_DIR})
 
 if(CLR_CMAKE_PLATFORM_ARCH_AMD64)
-  include_directories(../amd64)
   list(APPEND VM_CROSSGEN_SOURCES 
-    ../amd64/stublinkeramd64.cpp
+    ../${ARCH_SOURCES_DIR}/stublinkeramd64.cpp
   )
 elseif(CLR_CMAKE_PLATFORM_ARCH_I386)
-  include_directories(../i386)
   list(APPEND VM_CROSSGEN_SOURCES 
-    ../i386/stublinkerx86.cpp
+    ../${ARCH_SOURCES_DIR}/stublinkerx86.cpp
     ../gcdecode.cpp
   )
 elseif(CLR_CMAKE_PLATFORM_ARCH_ARM)
-  include_directories(../arm)
   list(APPEND VM_CROSSGEN_SOURCES 
-    ../arm/stubs.cpp
+    ../${ARCH_SOURCES_DIR}/stubs.cpp
   )
 elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64)
-  include_directories(../arm64)
   list(APPEND VM_CROSSGEN_SOURCES 
-    ../arm64/stubs.cpp
+    ../${ARCH_SOURCES_DIR}/stubs.cpp
   )
 else()
   clr_unknown_arch()