diff --git a/src/mono/CMakeLists.txt b/src/mono/CMakeLists.txt index d46df3a77a3b87..47dc6aecf82c64 100644 --- a/src/mono/CMakeLists.txt +++ b/src/mono/CMakeLists.txt @@ -330,13 +330,6 @@ elseif(TARGET_SYSTEM_NAME STREQUAL "ios" OR TARGET_SYSTEM_NAME STREQUAL "tvos") elseif(TARGET_SYSTEM_NAME STREQUAL "tvos") set(TARGET_TVOS 1) endif() -elseif(TARGET_SYSTEM_NAME STREQUAL "linux") - set(TARGET_UNIX 1) - set(TARGET_LINUX 1) -elseif(TARGET_SYSTEM_NAME STREQUAL "alpine") - set(TARGET_UNIX 1) - set(TARGET_LINUX 1) - set(TARGET_LINUX_MUSL 1) elseif(TARGET_SYSTEM_NAME STREQUAL "android") set(TARGET_UNIX 1) set(TARGET_LINUX_BIONIC 1) @@ -344,6 +337,13 @@ elseif(TARGET_SYSTEM_NAME STREQUAL "android") if (CMAKE_BUILD_TYPE STREQUAL "Release") add_compile_options(-O2) endif() +elseif(CLR_CMAKE_TARGET_LINUX_MUSL) + set(TARGET_UNIX 1) + set(TARGET_LINUX 1) + set(TARGET_LINUX_MUSL 1) +elseif(TARGET_SYSTEM_NAME STREQUAL "linux") + set(TARGET_UNIX 1) + set(TARGET_LINUX 1) elseif(TARGET_SYSTEM_NAME STREQUAL "emscripten") set(TARGET_BROWSER 1) if (CMAKE_BUILD_TYPE STREQUAL "Release") diff --git a/src/mono/mono/mini/mini-arm.h b/src/mono/mono/mini/mini-arm.h index 73bcc8bb8bb4b8..1d1a6af8b67a52 100644 --- a/src/mono/mono/mini/mini-arm.h +++ b/src/mono/mono/mini/mini-arm.h @@ -371,7 +371,7 @@ typedef struct MonoCompileArch { #define MONO_ARCH_HAVE_INTERP_PINVOKE_TRAMP 1 #define MONO_ARCH_HAVE_INTERP_NATIVE_TO_MANAGED 1 -#if defined(TARGET_WATCHOS) || (defined(__linux__) && !defined(TARGET_ANDROID)) +#if defined(TARGET_WATCHOS) || (defined(__linux__) && !defined(TARGET_ANDROID) && !defined(TARGET_LINUX_MUSL)) #define MONO_ARCH_DISABLE_HW_TRAPS 1 #define MONO_ARCH_HAVE_UNWIND_BACKTRACE 1 #endif