Skip to content

Commit 9bf3c2b

Browse files
committed
Update the compiler target to zOSV3R1 for Open XL
Open XL 2.2 on z/OS requires z/OS 3.1+ This updates the target level as a result of this requirement. Signed-off-by: Gaurav Chaudhari <[email protected]>
1 parent eb2e215 commit 9bf3c2b

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

cmake/modules/platform/toolcfg/openxl.cmake

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,14 @@
2121

2222
if(OMR_OS_ZOS)
2323
set(OMR_ZOS_COMPILE_ARCHITECTURE "arch10" CACHE STRING "z/OS compile machine architecture" FORCE)
24-
set(OMR_ZOS_COMPILE_TARGET "ZOSV2R5" CACHE STRING "z/OS compile target operating system" FORCE)
24+
if(JAVA_SPEC_VERSION GREATER_EQUAL 25)
25+
set(OMR_ZOS_COMPILE_TARGET "ZOSV3R1" CACHE STRING "z/OS compile target operating system" FORCE)
26+
set(OMR_ZOS_LINK_COMPAT "ZOSV3R1" CACHE STRING "z/OS link compatible operating system" FORCE)
27+
else()
28+
set(OMR_ZOS_COMPILE_TARGET "ZOSV2R5" CACHE STRING "z/OS compile target operating system" FORCE)
29+
set(OMR_ZOS_LINK_COMPAT "ZOSV2R5" CACHE STRING "z/OS link compatible operating system" FORCE)
30+
endif()
2531
set(OMR_ZOS_COMPILE_TUNE "12" CACHE STRING "z/OS compile machine architecture tuning" FORCE)
26-
set(OMR_ZOS_LINK_COMPAT "ZOSV2R5" CACHE STRING "z/OS link compatible operating system" FORCE)
2732
set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "--shared")
2833
set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "--shared")
2934

0 commit comments

Comments
 (0)