From 7311f4c846a444a287022478eb272c3f1bcec1fd Mon Sep 17 00:00:00 2001
From: Steve MacLean <Steve.MacLean@Microsoft.com>
Date: Fri, 17 Jan 2020 17:00:08 -0500
Subject: [PATCH] Rename CLR_CMAKE_HOST_ARCH CLR_CMAKE_PLATFORM_ARCH

---
 src/coreclr/CMakeLists.txt                   |  4 ++--
 src/coreclr/configurecompiler.cmake          | 24 ++++++++++----------
 src/coreclr/src/dlls/mscordac/CMakeLists.txt |  2 +-
 src/coreclr/src/pal/tools/gen-buildsys.cmd   |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt
index 2929f7eda5bdde..74b7007149e0aa 100644
--- a/src/coreclr/CMakeLists.txt
+++ b/src/coreclr/CMakeLists.txt
@@ -35,7 +35,7 @@ OPTION(CLR_CMAKE_WARNINGS_ARE_ERRORS "Warnings are errors" ON)
 
 # Ensure other tools are present
 if (WIN32)
-    if(CLR_CMAKE_HOST_ARCH STREQUAL arm)
+    if(CLR_CMAKE_PLATFORM_ARCH STREQUAL arm)
 
       # Confirm that Windows SDK is present
       if(NOT DEFINED CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION OR CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION STREQUAL "" )
@@ -53,7 +53,7 @@ if (WIN32)
       # Enable generic assembly compilation to avoid CMake generate VS proj files that explicitly
       # use ml[64].exe as the assembler.
       enable_language(ASM)
-    elseif(CLR_CMAKE_HOST_ARCH STREQUAL arm64)
+    elseif(CLR_CMAKE_PLATFORM_ARCH STREQUAL arm64)
 
       # Confirm that Windows SDK is present
       if(NOT DEFINED CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION OR CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION STREQUAL "" )
diff --git a/src/coreclr/configurecompiler.cmake b/src/coreclr/configurecompiler.cmake
index e3436bf8b6a859..f6811848a24943 100644
--- a/src/coreclr/configurecompiler.cmake
+++ b/src/coreclr/configurecompiler.cmake
@@ -141,25 +141,25 @@ include(${CMAKE_CURRENT_LIST_DIR}/configureoptimization.cmake)
 # Set HOST architecture variables
 if(CLR_CMAKE_PLATFORM_UNIX_ARM)
     set(CLR_CMAKE_PLATFORM_ARCH_ARM 1)
-    set(CLR_CMAKE_HOST_ARCH "arm")
+    set(CLR_CMAKE_PLATFORM_ARCH "arm")
 elseif(CLR_CMAKE_PLATFORM_UNIX_ARM64)
     set(CLR_CMAKE_PLATFORM_ARCH_ARM64 1)
-    set(CLR_CMAKE_HOST_ARCH "arm64")
+    set(CLR_CMAKE_PLATFORM_ARCH "arm64")
 elseif(CLR_CMAKE_PLATFORM_UNIX_AMD64)
     set(CLR_CMAKE_PLATFORM_ARCH_AMD64 1)
-    set(CLR_CMAKE_HOST_ARCH "x64")
+    set(CLR_CMAKE_PLATFORM_ARCH "x64")
 elseif(CLR_CMAKE_PLATFORM_UNIX_X86)
     set(CLR_CMAKE_PLATFORM_ARCH_I386 1)
-    set(CLR_CMAKE_HOST_ARCH "x86")
+    set(CLR_CMAKE_PLATFORM_ARCH "x86")
 elseif(WIN32)
-    # CLR_CMAKE_HOST_ARCH is passed in as param to cmake
-    if (CLR_CMAKE_HOST_ARCH STREQUAL x64)
+    # CLR_CMAKE_PLATFORM_ARCH is passed in as param to cmake
+    if (CLR_CMAKE_PLATFORM_ARCH STREQUAL x64)
         set(CLR_CMAKE_PLATFORM_ARCH_AMD64 1)
-    elseif(CLR_CMAKE_HOST_ARCH STREQUAL x86)
+    elseif(CLR_CMAKE_PLATFORM_ARCH STREQUAL x86)
         set(CLR_CMAKE_PLATFORM_ARCH_I386 1)
-    elseif(CLR_CMAKE_HOST_ARCH STREQUAL arm)
+    elseif(CLR_CMAKE_PLATFORM_ARCH STREQUAL arm)
         set(CLR_CMAKE_PLATFORM_ARCH_ARM 1)
-    elseif(CLR_CMAKE_HOST_ARCH STREQUAL arm64)
+    elseif(CLR_CMAKE_PLATFORM_ARCH STREQUAL arm64)
         set(CLR_CMAKE_PLATFORM_ARCH_ARM64 1)
     else()
         clr_unknown_arch()
@@ -170,7 +170,7 @@ endif()
 # Target arch will be a cmake param (optional) for both windows as well as non-windows build
 # if target arch is not specified then host & target are same
 if(NOT DEFINED CLR_CMAKE_TARGET_ARCH OR CLR_CMAKE_TARGET_ARCH STREQUAL "" )
-  set(CLR_CMAKE_TARGET_ARCH ${CLR_CMAKE_HOST_ARCH})
+  set(CLR_CMAKE_TARGET_ARCH ${CLR_CMAKE_PLATFORM_ARCH})
 endif()
 
 # Set target architecture variables
@@ -190,9 +190,9 @@ if (CLR_CMAKE_TARGET_ARCH STREQUAL x64)
 endif()
 
 # check if host & target arch combination are valid
-if(NOT(CLR_CMAKE_TARGET_ARCH STREQUAL CLR_CMAKE_HOST_ARCH))
+if(NOT(CLR_CMAKE_TARGET_ARCH STREQUAL CLR_CMAKE_PLATFORM_ARCH))
     if(NOT((CLR_CMAKE_PLATFORM_ARCH_AMD64 AND CLR_CMAKE_TARGET_ARCH_ARM64) OR (CLR_CMAKE_PLATFORM_ARCH_I386 AND CLR_CMAKE_TARGET_ARCH_ARM) OR (CLR_CMAKE_PLATFORM_ARCH_AMD64 AND CLR_CMAKE_TARGET_ARCH_ARM)))
-        message(FATAL_ERROR "Invalid host and target arch combination")
+        message(FATAL_ERROR "Invalid platform and target arch combination")
     endif()
 endif()
 
diff --git a/src/coreclr/src/dlls/mscordac/CMakeLists.txt b/src/coreclr/src/dlls/mscordac/CMakeLists.txt
index 348b663c8d1ff5..f0325a1db6e67d 100644
--- a/src/coreclr/src/dlls/mscordac/CMakeLists.txt
+++ b/src/coreclr/src/dlls/mscordac/CMakeLists.txt
@@ -186,7 +186,7 @@ target_link_libraries(mscordaccore PRIVATE ${COREDAC_LIBRARIES})
 install_clr(TARGETS mscordaccore)
 install_clr(TARGETS mscordaccore DESTINATION sharedFramework SKIP_STRIP)
 if(WIN32)
-    set(LONG_NAME_HOST_ARCH ${CLR_CMAKE_HOST_ARCH})
+    set(LONG_NAME_HOST_ARCH ${CLR_CMAKE_PLATFORM_ARCH})
     set(LONG_NAME_TARGET_ARCH ${CLR_CMAKE_TARGET_ARCH})
     if (CLR_CMAKE_PLATFORM_ARCH_AMD64)
         set(LONG_NAME_HOST_ARCH "amd64")
diff --git a/src/coreclr/src/pal/tools/gen-buildsys.cmd b/src/coreclr/src/pal/tools/gen-buildsys.cmd
index 612ce9b8a548c5..837e945f6b426c 100644
--- a/src/coreclr/src/pal/tools/gen-buildsys.cmd
+++ b/src/coreclr/src/pal/tools/gen-buildsys.cmd
@@ -40,7 +40,7 @@ shift
 goto loop
 :end_loop
 
-"%CMakePath%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DCLR_CMAKE_HOST_ARCH=%__Arch%" %__ExtraCmakeParams% -G "%__CmakeGenerator%" -S %__SourceDir% -B %__IntermediatesDir%
+"%CMakePath%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DCLR_CMAKE_PLATFORM_ARCH=%__Arch%" %__ExtraCmakeParams% -G "%__CmakeGenerator%" -S %__SourceDir% -B %__IntermediatesDir%
 endlocal
 exit /B !errorlevel!