Build support for s390x: corehost (#53949)

* Build the (non-Windows) host binaries with either runtime flavor * s390x architecture support in get_arch utility
dotnet · Jul 28, 2021 · db1b302 · db1b302
1 parent f5a7304
commit db1b302
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/native/corehost/CMakeLists.txt b/src/native/corehost/CMakeLists.txt
@@ -27,12 +27,12 @@ add_subdirectory(hostcommon)
 add_subdirectory(fxr)
 add_subdirectory(hostpolicy)
 
-if (NOT RUNTIME_FLAVOR STREQUAL Mono)
-    add_subdirectory(apphost)
-    add_subdirectory(dotnet)
-    add_subdirectory(nethost)
-    add_subdirectory(test)
+add_subdirectory(apphost)
+add_subdirectory(dotnet)
+add_subdirectory(nethost)
+add_subdirectory(test)
 
+if (NOT RUNTIME_FLAVOR STREQUAL Mono)
     if(CLR_CMAKE_TARGET_WIN32)
         add_subdirectory(comhost)
         add_subdirectory(ijwhost)

diff --git a/src/native/corehost/hostmisc/utils.cpp b/src/native/corehost/hostmisc/utils.cpp
@@ -195,6 +195,8 @@ const pal::char_t* get_arch()
     return _X("arm");
 #elif defined(TARGET_ARM64)
     return _X("arm64");
+#elif defined(TARGET_S390X)
+    return _X("s390x");
 #else
 #error "Unknown target"
 #endif