From c3620fceb3ee0361cc6179b291d6c3d5ebb6fab0 Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Mon, 6 Feb 2017 12:30:26 -0700 Subject: [PATCH] make OpenJDK build compatible with ojdkbuild artifacts One way to avoid the intense pain of building OpenJDK on Windows is to let somebody else do it, e.g. https://github.com/ojdkbuild/ojdkbuild. However, that project customizes the builds slightly, which means we need to make an effort to stay compatible. This one-liner does that. --- src/classpath-openjdk.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/classpath-openjdk.cpp b/src/classpath-openjdk.cpp index a9003fb8fc..5d4ef7ce51 100644 --- a/src/classpath-openjdk.cpp +++ b/src/classpath-openjdk.cpp @@ -669,6 +669,10 @@ class MyClasspath : public Classpath { # ifdef PLATFORM_WINDOWS expect(t, loadLibrary(t, libraryPath, "msvcr100", true, true)); # endif + // necessary for using OpenJDK builds from + // https://github.com/ojdkbuild/ojdkbuild: + loadLibrary(t, libraryPath, "ojdkbuild_zlib", true, true, false); + expect(t, loadLibrary(t, libraryPath, "verify", true, true)); expect(t, loadLibrary(t, libraryPath, "java", true, true)); #endif // not AVIAN_OPENJDK_SRC