diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-04-01 14:41:07 -0700 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-04-01 14:41:07 -0700 |
| commit | 51a5d22ab64129585f1825b8b66342224809549a (patch) | |
| tree | 877252a99a64218d83627ca88613f33b9cac392b /QMTest | |
| parent | 519353e7c438f0e0d1c695389ee0ed0362a9fa4c (diff) | |
| download | scons-51a5d22ab64129585f1825b8b66342224809549a.tar.gz | |
updates to finding java includes to work with oracle java 8 on linux
Diffstat (limited to 'QMTest')
| -rw-r--r-- | QMTest/TestSCons.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 6b087c06..ee10508a 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -712,7 +712,8 @@ class TestSCons(TestCommon): if not version: version='' jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Headers/jni.h', - '/usr/lib/jvm/default-java/include/jni.h'] + '/usr/lib/jvm/default-java/include/jni.h', + '/usr/lib/jvm/java-*-oracle/include/jni.h'] else: jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Versions/%s*/Headers/jni.h'%version] jni_dirs.extend(['/usr/lib/jvm/java-*-sun-%s*/include/jni.h'%version, |