Merge pull request #87 from pshipton/openssl3

Update to openssl 3.0.10 on Win & Mac
ibmruntimes · Aug 30, 2023 · 35e3aac · 35e3aac
2 parents 327c54f + bc14b7f
commit 35e3aac
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/sbin/prepareWorkspace.sh b/sbin/prepareWorkspace.sh
@@ -279,7 +279,12 @@ updateOpenj9Sources() {
   if [ "${BUILD_CONFIG[BUILD_VARIANT]}" == "${BUILD_VARIANT_OPENJ9}" ]; then
     cd "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/${BUILD_CONFIG[OPENJDK_SOURCE_DIR]}" || return
     # NOTE: fetched openssl will NOT be used in the RISC-V cross-compile situation
-    bash get_source.sh --openssl-version=1.1.1v
+    if [[ "${BUILD_CONFIG[OS_KERNEL_NAME]}" = *"cygwin"* ]] || [[ "${BUILD_CONFIG[OS_KERNEL_NAME]}" == "darwin" ]]; then
+      bash get_source.sh --openssl-version=3.0.10
+    else
+      # Continue using 1.1.1 until all platforms can build 3.0.10
+      bash get_source.sh --openssl-version=1.1.1v
+    fi
     cd "${BUILD_CONFIG[WORKSPACE_DIR]}"
   fi
 }