stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8318669: Target OS detection in 'test-prebuilt' makefile target is incorrect when running on MSYS2

Browse Source 
Reviewed-by: ihse, erikj
This commit is contained in:
Frederic Thevenet 2023-10-25 12:58:01 +00:00 committed by Magnus Ihse Bursie
parent c587211bf8
commit 202c0137b8
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
make/RunTestsPrebuilt.gmk
View File

@ -158,6 +158,10 @@ ifeq ($(UNAME_OS), CYGWIN)
OPENJDK_TARGET_OS := windows OPENJDK_TARGET_OS := windows
OPENJDK_TARGET_OS_TYPE := windows OPENJDK_TARGET_OS_TYPE := windows
OPENJDK_TARGET_OS_ENV := windows.cygwin OPENJDK_TARGET_OS_ENV := windows.cygwin
else ifeq ($(UNAME_OS), MINGW64)
OPENJDK_TARGET_OS := windows
OPENJDK_TARGET_OS_TYPE := windows
OPENJDK_TARGET_OS_ENV := windows.msys2
else else
OPENJDK_TARGET_OS_TYPE:=unix OPENJDK_TARGET_OS_TYPE:=unix
ifeq ($(UNAME_OS), Linux) ifeq ($(UNAME_OS), Linux)
@ -170,6 +174,9 @@ else
OPENJDK_TARGET_OS_ENV := $(OPENJDK_TARGET_OS) OPENJDK_TARGET_OS_ENV := $(OPENJDK_TARGET_OS)
endif 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 # Assume little endian unless otherwise specified
OPENJDK_TARGET_CPU_ENDIAN := little OPENJDK_TARGET_CPU_ENDIAN := little