summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2014-12-09 15:23:26 -0330
committerDwayne Boone <dwayne@zeroc.com>2014-12-09 15:23:26 -0330
commit146997347c680c30320df739f5dc51293c22455e (patch)
tree0fcd82740c429fc4760a42ada830bd5749c5c71d /java/src
parentminor fix for testicedist.py (diff)
downloadice-146997347c680c30320df739f5dc51293c22455e.tar.bz2
ice-146997347c680c30320df739f5dc51293c22455e.tar.xz
ice-146997347c680c30320df739f5dc51293c22455e.zip
ICE-6102 Java build failure with IBM JDK
Diffstat (limited to 'java/src')
-rw-r--r--java/src/IceGridGUI/build.gradle9
1 files changed, 6 insertions, 3 deletions
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle
index 5854f65836b..5c0be359dd5 100644
--- a/java/src/IceGridGUI/build.gradle
+++ b/java/src/IceGridGUI/build.gradle
@@ -70,9 +70,12 @@ buildscript {
}
def libJars = []
-['rt.jar', 'jsse.jar'].each {
- libJars << searchFile([{System.env['JAVA_HOME']}, {System.properties['java.home']}],
- ["${it}", "lib/${it}", "jre/lib/${it}"])
+['rt.jar', 'jsse.jar', 'i386/default/jclSC170/vm.jar', 'amd64/default/jclSC170/vm.jar', 'ibmcertpathfw.jar', 'math.jar'].each {
+ def jfile = searchFile([{System.env['JAVA_HOME']}, {System.properties['java.home']}],
+ ["${it}", "lib/${it}", "jre/lib/${it}"])
+ if (jfile) {
+ libJars << jfile
+ }
}
if (hasJavaFx) {