Skip to content

Commit 6171ff1

Browse files
committed
[druntime-test]: exceptions: try != instead of $(shell)
Signed-off-by: Andrei Horodniceanu <[email protected]>
1 parent 2116615 commit 6171ff1

File tree

1 file changed

+7
-10
lines changed
  • runtime/druntime/test/exceptions

1 file changed

+7
-10
lines changed

runtime/druntime/test/exceptions/Makefile

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,16 @@ ifdef IN_LDC
33
include ../../../../dmd/osmodel.mak
44
endif
55

6-
$(info $(shell which apk ; echo $$?))
7-
$(info $(shell which apk && echo 1 ; echo $$?))
8-
$(info $(shell command -v apk ; echo $$?))
9-
$(info $(shell command -v apk && echo 1 ; echo $$?))
6+
$(info $(shell which apk &>/dev/null; echo $$?))
7+
$(info $(shell which apk &>/dev/null && echo 1 ; echo $$?))
8+
$(info $(shell command -v apk &>/dev/null ; echo $$?))
9+
$(info $(shell command -v apk &>/dev/null && echo 1 ; echo $$?))
10+
1011

1112
ifeq ($(OS),linux)
1213
# FIXME: detect musl libc robustly; just checking Alpine Linux' apk tool for now
13-
ifeq (1,$(shell command -v apk &>/dev/null && echo 1))
14-
$(warning ~~~ musl detected)
15-
IS_MUSL:=1
16-
else
17-
$(warning ~~~ musl NOT detected)
18-
endif
14+
IS_MUSL != command -v apk &>/dev/null && echo 1
15+
$(warning ~~~ musl $(IS_MUSL))
1916
endif
2017

2118
TESTS=stderr_msg unittest_assert invalid_memory_operation static_dtor \

0 commit comments

Comments
 (0)