diff options
| author | Mats Wichmann <mats@linux.com> | 2021-11-05 13:30:46 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2021-11-05 13:35:48 (GMT) |
| commit | 1716ce554d4d072ba4fa0664f7a4e6aa53c83428 (patch) | |
| tree | 1109c16e36561237a8cde1df4fe36ceebc79cf1a /SCons/Tool/JavaCommon.py | |
| parent | 027c15f002610eae38212fe282963553a86a66ef (diff) | |
| download | SCons-1716ce554d4d072ba4fa0664f7a4e6aa53c83428.zip SCons-1716ce554d4d072ba4fa0664f7a4e6aa53c83428.tar.gz SCons-1716ce554d4d072ba4fa0664f7a4e6aa53c83428.tar.bz2 | |
Add userguide update on javah as well
Also add more linux locations for Java headers (old saved patch)
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'SCons/Tool/JavaCommon.py')
| -rw-r--r-- | SCons/Tool/JavaCommon.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/SCons/Tool/JavaCommon.py b/SCons/Tool/JavaCommon.py index dac7d50..adec1d3 100644 --- a/SCons/Tool/JavaCommon.py +++ b/SCons/Tool/JavaCommon.py @@ -59,14 +59,17 @@ java_macos_version_include_dir_glob = '/System/Library/Frameworks/JavaVM.framewo java_linux_include_dirs_glob = [ '/usr/lib/jvm/default-java/include', - '/usr/lib/jvm/java-*/include' + '/usr/lib/jvm/java-*/include', + '/opt/oracle-jdk-bin-*/include', + '/opt/openjdk-bin-*/include', + '/usr/lib/openjdk-*/include', ] # Need to match path like below (from Centos 7) # /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.191.b12-0.el7_5.x86_64/include/ java_linux_version_include_dirs_glob = [ '/usr/lib/jvm/java-*-sun-%s*/include', '/usr/lib/jvm/java-%s*-openjdk*/include', - '/usr/java/jdk%s*/include' + '/usr/java/jdk%s*/include', ] if java_parsing: |