From 28c7f761d9d2e60043930c1d699ad79c72c2a29c Mon Sep 17 00:00:00 2001 From: Lan Xia Date: Thu, 25 Apr 2024 17:38:01 -0400 Subject: [PATCH] Add -Dfile.encoding=IBM-1047 for JDK21 zOS Signed-off-by: Lan Xia --- makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/makefile b/makefile index ef414113..789f3107 100644 --- a/makefile +++ b/makefile @@ -38,9 +38,18 @@ endif UNAME := uname UNAME_OS := $(shell $(UNAME) -s | cut -f1 -d_) +$(info UNAME_OS is $(UNAME_OS)) ifeq ($(findstring CYGWIN,$(UNAME_OS)), CYGWIN) LIB_DIR:=$(shell cygpath -w $(LIB_DIR)) +else ifeq ($(UNAME_OS),OS/390) +# The issue is still being investigated. See backlog/issues/1424 +# set -Dfile.encoding=IBM-1047 for JDK21+ zOS for now +ifeq ($(shell test $(JDK_VERSION) -ge 21; echo $$?),0) +export IBM_JAVA_OPTIONS="-Dfile.encoding=IBM-1047" +$(info export IBM_JAVA_OPTIONS="-Dfile.encoding=IBM-1047") endif +endif + export LIB_DIR:=$(subst \,/,$(LIB_DIR)) $(info LIB_DIR is set to $(LIB_DIR))