diff --git a/src/native/corehost/CMakeLists.txt b/src/native/corehost/CMakeLists.txt
index d7784410ed03d..21e4a6c80f61c 100644
--- 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
index abf1aeee89e0a..21cc7e9c9b49e 100644
--- 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