Skip to content

Commit cc28b26

Browse files
committed
[factor out is_musl.mak]
1 parent 6e51248 commit cc28b26

File tree

3 files changed

+10
-18
lines changed

3 files changed

+10
-18
lines changed

druntime/test/exceptions/Makefile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1-
ifndef IS_MUSL # LDC defines it externally
2-
ifeq ($(OS),linux)
3-
# FIXME: detect musl libc robustly; just checking Alpine Linux' apk tool for now
4-
ifeq (1,$(shell which apk >/dev/null 2>&1 && echo 1))
5-
IS_MUSL := 1
6-
endif
7-
endif
8-
endif
9-
101
TESTS=stderr_msg unittest_assert invalid_memory_operation static_dtor \
112
future_message refcounted rt_trap_exceptions_drt catch_in_finally \
123
message_with_null
134

145
# FIXME: segfaults with musl libc
6+
include ../is_musl.mak
157
ifneq ($(IS_MUSL),1)
168
TESTS += unknown_gc
179
endif

druntime/test/importc_compare/Makefile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
TESTS := importc_compare
22

3-
ifndef IS_MUSL # LDC defines it externally
4-
ifeq ($(OS),linux)
5-
# FIXME: detect musl libc robustly; just checking Alpine Linux' apk tool for now
6-
ifeq (1,$(shell which apk >/dev/null 2>&1 && echo 1))
7-
IS_MUSL := 1
8-
endif
9-
endif
10-
endif
11-
123
# FIXME: fails on Alpine v3.21 with conflicting struct declarations in the C headers:
134
# /usr/include/asm-generic/fcntl.h(195): Error: struct `importc_includes.flock` conflicts with struct `importc_includes.flock` at /usr/include/fcntl.h(24)
5+
include ../is_musl.mak
146
ifeq ($(IS_MUSL),1)
157
TESTS :=
168
endif

druntime/test/is_musl.mak

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
ifndef IS_MUSL # LDC defines it externally
2+
ifeq ($(OS),linux)
3+
# FIXME: detect musl libc robustly; just checking Alpine Linux' apk tool for now
4+
ifeq (1,$(shell which apk >/dev/null 2>&1 && echo 1))
5+
IS_MUSL := 1
6+
endif
7+
endif
8+
endif

0 commit comments

Comments
 (0)