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>
wangxin12 committed
Apr 2, 2026 at 09:25 UTC
f8e579a027b085348f33c31254fc9ad8c2926c70
3 files changed
+5
-2
CMakeLists.txt
+3
@@ -188,10 +188,12 @@ endif()
188
189
if (${TARGET_PLATFORM} STREQUAL "x64")
190
add_compile_definitions(_AMD64_)
191
+ set(DISTRO_HOSTTYPE x86_64)
192
endif()
193
194
if (${TARGET_PLATFORM} STREQUAL "arm64")
195
add_compile_definitions(_ARM64_)
196
+ set(DISTRO_HOSTTYPE aarch64)
197
endif()
198
199
add_definitions(/sdl) # Default-initialize class members
@@ -214,6 +216,7 @@ add_compile_definitions(UNICODE
216
WSL_PACKAGE_VERSION_MAJOR=${PACKAGE_VERSION_MAJOR}
217
WSL_PACKAGE_VERSION_MINOR=${PACKAGE_VERSION_MINOR}
218
WSL_PACKAGE_VERSION_REVISION=${PACKAGE_VERSION_REVISION}
219
+ DISTRO_HOSTTYPE="${DISTRO_HOSTTYPE}"
220
WSL_BUILD_WSL_SETTINGS=${WSL_BUILD_WSL_SETTINGS})
221
222
if (${OFFICIAL_BUILD})
src/windows/service/exe/DistributionRegistration.h
+1
-1
@@ -107,7 +107,7 @@ namespace Property {
107
108
inline DistributionPropertyWithDefault<std::vector<std::string>> DefaultEnvironment{
109
L"DefaultEnvironment",
110
- {"HOSTTYPE=x86_64",
110
+ {"HOSTTYPE=" DISTRO_HOSTTYPE,
111
"LANG=en_US.UTF-8",
112
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games",
113
"TERM=xterm-256color"}};
src/windows/service/inc/wslservice.idl
+1
-1
@@ -95,7 +95,7 @@ cpp_quote("#define LXSS_DISTRO_VERSION_2 2")
95
cpp_quote("#define LXSS_DISTRO_VERSION_CURRENT LXSS_DISTRO_VERSION_2")
96
cpp_quote("#define LXSS_DISTRO_USES_WSL_FS(DistroVersion) (DistroVersion >= LXSS_DISTRO_VERSION_2)")
97
98
-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\"")
98
+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\"")
99
100
cpp_quote("#define LXSS_DISTRO_DEFAULT_KERNEL_COMMAND_LINE \"BOOT_IMAGE=/kernel init=/init\"")
101