OPENJDK_TARGET_OS should resolve as "windows" when running on MINGW64

fthevenet · Oct 23, 2023 · 15f6bd7 · 15f6bd7
1 parent 94f3812
commit 15f6bd7
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
@@ -158,15 +158,21 @@ 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.mingw64
   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
 
 # Assume little endian unless otherwise specified