From b780376e4a71e5063f136698038b009c87b0cdf4 Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Tue, 3 Sep 2024 11:52:40 -0400 Subject: [PATCH] Update according to code review --- closed/make/modules/openjceplus/Lib.gmk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/closed/make/modules/openjceplus/Lib.gmk b/closed/make/modules/openjceplus/Lib.gmk index df54efddade..aa11aef0fcb 100644 --- a/closed/make/modules/openjceplus/Lib.gmk +++ b/closed/make/modules/openjceplus/Lib.gmk @@ -44,11 +44,11 @@ else ifeq ($(call isTargetOs, linux), true) else ifeq ($(call isTargetOs, windows), true) ifeq ($(call isTargetCpu, x86_64), true) OPENJCEPLUS_BOOT_JDK := $(call MixedPath,$(OPENJCEPLUS_BOOT_JDK)) - OPENJCEPLUS_VS_LIB := '$(OPENJ9_VS_LIB)' OPENJCEPLUS_GSKIT_HOME := $(call MixedPath,$(OPENJCEPLUS_GSKIT_HOME)) OPENJCEPLUS_JCE_CLASSPATH := "$(call MixedPath,$(JDK_OUTPUTDIR)/modules/openjceplus)\;$(call MixedPath,$(JDK_OUTPUTDIR)/modules/java.base)" OPENJCEPLUS_JGSKIT_MAKE := jgskit.win64.mak OPENJCEPLUS_JGSKIT_PLATFORM := win64 + OPENJCEPLUS_VS_LIB := LIB='$(OPENJ9_VS_LIB)' endif endif @@ -61,10 +61,10 @@ endif # OPENJCEPLUS_JGSKIT_PLATFORM compile-libs : @$(ECHO) Compiling OpenJCEPlus native code export \ + $(OPENJCEPLUS_VS_LIB) \ GSKIT_HOME=$(OPENJCEPLUS_GSKIT_HOME) \ JAVA_HOME=$(OPENJCEPLUS_BOOT_JDK) \ JCE_CLASSPATH=$(OPENJCEPLUS_JCE_CLASSPATH) \ - LIB=$(OPENJCEPLUS_VS_LIB) \ PLATFORM=$(OPENJCEPLUS_JGSKIT_PLATFORM) \ && $(MAKE) -j1 -C $(OPENJCEPLUS_JGSKIT_MAKE_PATH) -f $(OPENJCEPLUS_JGSKIT_MAKE) all @$(ECHO) OpenJCEplus compile complete