update

taoliult · Oct 23, 2023 · 12bfbfb · 12bfbfb
1 parent 2029b3b
commit 12bfbfb
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/closed/custom/Main.gmk b/closed/custom/Main.gmk
@@ -125,6 +125,8 @@ ifeq (true,$(BUILD_JGSKIT))
 # Identify the desired JGSKIT target platform.
 JGSKIT_TARGET :=
 JGSKIT_MAKE := jgskit.mak
+JGSKIT_MAKE_PATH := $(OPENJCEPLUS_TOPDIR)/src/main/native/
+JCE_CLASSPATH := $(OPENJCEPLUS_TOPDIR)/src/main/java/:$(TOPDIR)/src/java.base/share/classes/
 
 ifeq ($(OPENJDK_TARGET_OS), aix)
   JGSKIT_TARGET := ppc-aix64
@@ -151,15 +153,15 @@ clean : clean-openjceplus
 
 clean-openjceplus :
 	@$(ECHO) Cleaning OpenJCEPlus native
-	@$(RM) -f $(addprefix $(OPENJCEPLUS_TOPDIR)/src/main/native/, com_ibm_crypto_plus_provider_icc_NativeInterface.h com_ibm_crypto_plus_provider_icc_FastJNIBuffer.h libjgskit.x)
-	$(MAKE) -C $(OPENJCEPLUS_TOPDIR)/src/main/native/ -f $(JGSKIT_MAKE) cleanAll
+	@$(RM) -f $(addprefix $(JGSKIT_MAKE_PATH), com_ibm_crypto_plus_provider_icc_NativeInterface.h com_ibm_crypto_plus_provider_icc_FastJNIBuffer.h libjgskit.x)
+	$(MAKE) -C $(JGSKIT_MAKE_PATH) -f $(JGSKIT_MAKE) cleanAll
 
 openjceplus-copy : openjceplus-libs
 
 openjceplus-libs :
 	@$(ECHO) Compiling OpenJCEPlus native
-	export PLATFORM=$(JGSKIT_TARGET) JAVA_HOME=$(BOOT_JDK) GSKIT_HOME=$(GSKIT_HOME) JCE_CLASSPATH=$(OPENJCEPLUS_TOPDIR)/src/main/java/:$(TOPDIR)/src/java.base/share/classes/ \
-		&& $(MAKE) -j1 -C $(OPENJCEPLUS_TOPDIR)/src/main/native/ -f $(JGSKIT_MAKE) all
+	export PLATFORM=$(JGSKIT_TARGET) JAVA_HOME=$(BOOT_JDK) GSKIT_HOME=$(GSKIT_HOME) JCE_CLASSPATH=$(JCE_CLASSPATH) \
+		&& $(MAKE) -j1 -C $(JGSKIT_MAKE_PATH) -f $(JGSKIT_MAKE) all
 	@$(ECHO) OpenJCEplus compile complete
 
 endif # BUILD_JGSKIT