Merge pull request #10 from narkedi/ifix-11.0.20.1_APAR-IJ47758_20230…

…906-01 Add additional options to jmod to work
ibmruntimes · Oct 6, 2023 · cda923f · cda923f
2 parents 7bd7758 + cb8c708
commit cda923f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/make/CreateJmods.gmk b/make/CreateJmods.gmk
@@ -227,7 +227,7 @@ $(JMODS_DIR)/$(MODULE).jmod: $(DEPS)
 	        --module-version $(VERSION_SHORT) \
 	        --target-platform '$(OPENJDK_MODULE_TARGET_PLATFORM)' \
 	        --module-path $(JMODS_DIR) \
-	        $(JMOD_FLAGS) $(JMODS_TEMPDIR)/$(notdir $@) \
+	        $(JMOD_FLAGS) -J-Djdk.nativeCrypto=false $(JMODS_TEMPDIR)/$(notdir $@) \
 	)
 	$(MV) $(JMODS_TEMPDIR)/$(notdir $@) $@
 

diff --git a/make/Images.gmk b/make/Images.gmk
@@ -73,7 +73,7 @@ JLINK_ORDER_RESOURCES += \
     /jdk.localedata/** \
     #
 
-JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \
+JLINK_TOOL := $(JLINK) -J-Djdk.nativeCrypto=false -J-Djlink.debug=true \
     --module-path $(IMAGES_OUTPUTDIR)/jmods \
     --endian $(OPENJDK_TARGET_CPU_ENDIAN) \
     --release-info $(BASE_RELEASE_FILE) \