ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #520 from dicej/master

Browse Source 
make OpenJDK build compatible with ojdkbuild artifacts
This commit is contained in:
Joel Dice 2017-02-06 17:05:33 -07:00 committed by GitHub
commit 649503c6d0
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/classpath-openjdk.cpp
View File

@ -669,6 +669,10 @@ class MyClasspath : public Classpath {
# ifdef PLATFORM_WINDOWS # ifdef PLATFORM_WINDOWS
expect(t, loadLibrary(t, libraryPath, "msvcr100", true, true)); expect(t, loadLibrary(t, libraryPath, "msvcr100", true, true));
# endif # 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, "verify", true, true));
expect(t, loadLibrary(t, libraryPath, "java", true, true)); expect(t, loadLibrary(t, libraryPath, "java", true, true));
#endif // not AVIAN_OPENJDK_SRC #endif // not AVIAN_OPENJDK_SRC