Skip to content

Commit 202c013

Browse files
fthevenetmagicus
authored andcommitted
8318669: Target OS detection in 'test-prebuilt' makefile target is incorrect when running on MSYS2
Reviewed-by: ihse, erikj
1 parent c587211 commit 202c013

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

make/RunTestsPrebuilt.gmk

+7
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,10 @@ ifeq ($(UNAME_OS), CYGWIN)
158158
OPENJDK_TARGET_OS := windows
159159
OPENJDK_TARGET_OS_TYPE := windows
160160
OPENJDK_TARGET_OS_ENV := windows.cygwin
161+
else ifeq ($(UNAME_OS), MINGW64)
162+
OPENJDK_TARGET_OS := windows
163+
OPENJDK_TARGET_OS_TYPE := windows
164+
OPENJDK_TARGET_OS_ENV := windows.msys2
161165
else
162166
OPENJDK_TARGET_OS_TYPE:=unix
163167
ifeq ($(UNAME_OS), Linux)
@@ -170,6 +174,9 @@ else
170174
OPENJDK_TARGET_OS_ENV := $(OPENJDK_TARGET_OS)
171175
endif
172176

177+
# Sanity check env detection
178+
$(info Detected target OS, type and env: [$(OPENJDK_TARGET_OS)] [$(OPENJDK_TARGET_OS_TYPE)] [$(OPENJDK_TARGET_OS_ENV)])
179+
173180
# Assume little endian unless otherwise specified
174181
OPENJDK_TARGET_CPU_ENDIAN := little
175182

0 commit comments

Comments
 (0)