Set Distro Env HOSTTYPE to aarch64 for ARM64 build (#40048)

* Set Distro Env HOSTTYPE to aarch64 for ARM64 build


---------

Co-authored-by: Xin Wang (from Dev Box) <xiwang4@microsoft.com>

Author: wangxin12

CMakeLists.txt

@@ -188,10 +188,12 @@ endif()
 
 if (${TARGET_PLATFORM} STREQUAL "x64")
     add_compile_definitions(_AMD64_)
+    set(DISTRO_HOSTTYPE x86_64)
 endif()
 
 if (${TARGET_PLATFORM} STREQUAL "arm64")
     add_compile_definitions(_ARM64_)
+    set(DISTRO_HOSTTYPE aarch64)
 endif()
 
 add_definitions(/sdl) # Default-initialize class members
@@ -214,6 +216,7 @@ add_compile_definitions(UNICODE
                         WSL_PACKAGE_VERSION_MAJOR=${PACKAGE_VERSION_MAJOR}
                         WSL_PACKAGE_VERSION_MINOR=${PACKAGE_VERSION_MINOR}
                         WSL_PACKAGE_VERSION_REVISION=${PACKAGE_VERSION_REVISION}
+                        DISTRO_HOSTTYPE="${DISTRO_HOSTTYPE}"
                         WSL_BUILD_WSL_SETTINGS=${WSL_BUILD_WSL_SETTINGS})
 
 if (${OFFICIAL_BUILD})

src/windows/service/exe/DistributionRegistration.h

@@ -107,7 +107,7 @@ namespace Property {
 
     inline DistributionPropertyWithDefault<std::vector<std::string>> DefaultEnvironment{
         L"DefaultEnvironment",
-        {"HOSTTYPE=x86_64",
+        {"HOSTTYPE=" DISTRO_HOSTTYPE,
          "LANG=en_US.UTF-8",
          "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games",
          "TERM=xterm-256color"}};

src/windows/service/inc/wslservice.idl

@@ -95,7 +95,7 @@ cpp_quote("#define LXSS_DISTRO_VERSION_2 2")
 cpp_quote("#define LXSS_DISTRO_VERSION_CURRENT LXSS_DISTRO_VERSION_2")
 cpp_quote("#define LXSS_DISTRO_USES_WSL_FS(DistroVersion) (DistroVersion >= LXSS_DISTRO_VERSION_2)")
 
-cpp_quote("#define LXSS_DISTRO_DEFAULT_ENVIRONMENT \"HOSTTYPE=x86_64\0LANG=en_US.UTF-8\0PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games\0TERM=xterm-256color\0\"")
+cpp_quote("#define LXSS_DISTRO_DEFAULT_ENVIRONMENT \"HOSTTYPE=\" DISTRO_HOSTTYPE \"\\0LANG=en_US.UTF-8\\0PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games\\0TERM=xterm-256color\\0\"")
 
 cpp_quote("#define LXSS_DISTRO_DEFAULT_KERNEL_COMMAND_LINE \"BOOT_IMAGE=/kernel init=/init\"")