8318669: Target OS detection in 'test-prebuilt' makefile target is in…

…correct when running on MSYS2
fthevenet · Oct 24, 2023 · 7a79d5f · 7a79d5f
1 parent 4a16d11
commit 7a79d5f
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
@@ -159,17 +159,26 @@ ifeq ($(UNAME_OS), CYGWIN)
   OPENJDK_TARGET_OS_TYPE := windows
   OPENJDK_TARGET_OS_ENV := windows.cygwin
 else
-  OPENJDK_TARGET_OS_TYPE:=unix
-  ifeq ($(UNAME_OS), Linux)
-    OPENJDK_TARGET_OS := linux
-  else ifeq ($(UNAME_OS), Darwin)
-    OPENJDK_TARGET_OS := macosx
+  ifeq ($(UNAME_OS), MINGW64)
+    OPENJDK_TARGET_OS := windows
+    OPENJDK_TARGET_OS_TYPE := windows
+    OPENJDK_TARGET_OS_ENV := windows.msys2
   else
-    OPENJDK_TARGET_OS := $(UNAME_OS)
+    OPENJDK_TARGET_OS_TYPE:=unix
+    ifeq ($(UNAME_OS), Linux)
+      OPENJDK_TARGET_OS := linux
+    else ifeq ($(UNAME_OS), Darwin)
+      OPENJDK_TARGET_OS := macosx
+    else
+      OPENJDK_TARGET_OS := $(UNAME_OS)
+    endif
+    OPENJDK_TARGET_OS_ENV := $(OPENJDK_TARGET_OS)
   endif
-  OPENJDK_TARGET_OS_ENV := $(OPENJDK_TARGET_OS)
 endif
 
+# Sanity check env detection
+$(info Detected target OS, type and env: [$(OPENJDK_TARGET_OS)] [$(OPENJDK_TARGET_OS_TYPE)] [$(OPENJDK_TARGET_OS_ENV)])
+
 # Assume little endian unless otherwise specified
 OPENJDK_TARGET_CPU_ENDIAN := little