Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion runtime/DRuntimeIntegrationTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ else()
list(REMOVE_ITEM testnames uuid)
endif()

set(musl "")
set(musl "IS_MUSL=0")
if(TARGET_SYSTEM MATCHES "musl")
set(musl "IS_MUSL=1")
endif()
Expand Down
9 changes: 9 additions & 0 deletions runtime/druntime/test/exceptions/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@ ifdef IN_LDC
include ../../../../dmd/osmodel.mak
endif

ifndef IS_MUSL # LDC defines it externally
ifeq ($(OS),linux)
# FIXME: detect musl libc robustly; just checking Alpine Linux' apk tool for now
ifeq (1,$(shell which apk >/dev/null 2>&1 && echo 1))
IS_MUSL := 1
endif
endif
endif

TESTS=stderr_msg unittest_assert invalid_memory_operation static_dtor \
future_message refcounted rt_trap_exceptions_drt catch_in_finally \
message_with_null
Expand Down
15 changes: 11 additions & 4 deletions runtime/druntime/test/importc_compare/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,19 @@ endif

TESTS := importc_compare

ifndef IS_MUSL # LDC defines it externally
ifeq ($(OS),linux)
# FIXME: detect musl libc robustly; just checking Alpine Linux' apk tool for now
ifeq (1,$(shell which apk >/dev/null 2>&1 && echo 1))
IS_MUSL := 1
endif
endif
endif

# FIXME: fails on Alpine v3.21 with conflicting struct declarations in the C headers:
# /usr/include/asm-generic/fcntl.h(195): Error: struct `importc_includes.flock` conflicts with struct `importc_includes.flock` at /usr/include/fcntl.h(24)
ifeq ($(OS),linux)
ifeq (1,$(IS_MUSL))
TESTS :=
endif
ifeq ($(IS_MUSL),1)
TESTS :=
endif

# FIXME: fails on macOS arm64, e.g., due to unsupported `_Float16`
Expand Down
Loading