From 2a31fc30de9cdbca6374170bea97f1dc10c08f5a Mon Sep 17 00:00:00 2001
From: Pasam Soujanya <psoujany@in.ibm.com>
Date: Mon, 2 Dec 2024 18:28:49 +0530
Subject: [PATCH] remove options

---
 makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/makefile b/makefile
index 3f1829eb..7894071c 100644
--- a/makefile
+++ b/makefile
@@ -40,11 +40,6 @@ UNAME := uname
 UNAME_OS := $(shell $(UNAME) -s | cut -f1 -d_)
 ifeq ($(findstring CYGWIN,$(UNAME_OS)), CYGWIN)
 	LIB_DIR:=$(shell cygpath -w $(LIB_DIR))
-else ifeq ($(UNAME), OS/390)
-ifeq ($(shell test $(JDK_VERSION) -ge 21; echo $$?),0)
-JVM_OPTIONS:= "-Dfile.encoding=IBM-1047"
-$(info JVM_OPTIONS set $(JVM_OPTIONS))
-endif
 endif
 
 
@@ -88,7 +83,13 @@ compile: buildListGen
 # If AUTO_DETECT is turned on, compile and execute envDetector in build_envInfo.xml.
 #######################################
 envDetect: compileTools
-	${TEST_JDK_HOME}$(D)bin$(D)java $(JVM_OPTIONS) -cp .$(D)bin$(D)TestKitGen.jar org.openj9.envInfo.EnvDetector
+ifeq ($(UNAME), OS/390)
+ifeq ($(shell test $(JDK_VERSION) -ge 21; echo $$?),0)
+	${TEST_JDK_HOME}$(D)bin$(D)java -Dfile.encoding=IBM-1047 -cp .$(D)bin$(D)TestKitGen.jar org.openj9.envInfo.EnvDetector
+else
+	${TEST_JDK_HOME}$(D)bin$(D)java -cp .$(D)bin$(D)TestKitGen.jar org.openj9.envInfo.EnvDetector
+endif
+endif
 
 #######################################
 # Generate refined BUILD_LIST.