Skip to content

Commit 656f340

Browse files
authored
Fix mono build on alpine arm (#100781)
* Fix mono build on alpine arm * Update src/mono/CMakeLists.txt * Update CMakeLists.txt
1 parent f190dd2 commit 656f340

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/mono/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -330,20 +330,20 @@ elseif(TARGET_SYSTEM_NAME STREQUAL "ios" OR TARGET_SYSTEM_NAME STREQUAL "tvos")
330330
elseif(TARGET_SYSTEM_NAME STREQUAL "tvos")
331331
set(TARGET_TVOS 1)
332332
endif()
333-
elseif(TARGET_SYSTEM_NAME STREQUAL "linux")
334-
set(TARGET_UNIX 1)
335-
set(TARGET_LINUX 1)
336-
elseif(TARGET_SYSTEM_NAME STREQUAL "alpine")
337-
set(TARGET_UNIX 1)
338-
set(TARGET_LINUX 1)
339-
set(TARGET_LINUX_MUSL 1)
340333
elseif(TARGET_SYSTEM_NAME STREQUAL "android")
341334
set(TARGET_UNIX 1)
342335
set(TARGET_LINUX_BIONIC 1)
343336
set(TARGET_ANDROID 1)
344337
if (CMAKE_BUILD_TYPE STREQUAL "Release")
345338
add_compile_options(-O2)
346339
endif()
340+
elseif(CLR_CMAKE_TARGET_LINUX_MUSL)
341+
set(TARGET_UNIX 1)
342+
set(TARGET_LINUX 1)
343+
set(TARGET_LINUX_MUSL 1)
344+
elseif(TARGET_SYSTEM_NAME STREQUAL "linux")
345+
set(TARGET_UNIX 1)
346+
set(TARGET_LINUX 1)
347347
elseif(TARGET_SYSTEM_NAME STREQUAL "emscripten")
348348
set(TARGET_BROWSER 1)
349349
if (CMAKE_BUILD_TYPE STREQUAL "Release")

src/mono/mono/mini/mini-arm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ typedef struct MonoCompileArch {
371371
#define MONO_ARCH_HAVE_INTERP_PINVOKE_TRAMP 1
372372
#define MONO_ARCH_HAVE_INTERP_NATIVE_TO_MANAGED 1
373373

374-
#if defined(TARGET_WATCHOS) || (defined(__linux__) && !defined(TARGET_ANDROID))
374+
#if defined(TARGET_WATCHOS) || (defined(__linux__) && !defined(TARGET_ANDROID) && !defined(TARGET_LINUX_MUSL))
375375
#define MONO_ARCH_DISABLE_HW_TRAPS 1
376376
#define MONO_ARCH_HAVE_UNWIND_BACKTRACE 1
377377
#endif

0 commit comments

Comments
 (0)