blob: 708447592fa8ba50974a8074710f3e598f4d7f9c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
diff -Nur old/scons-3.0.5/src/engine/SCons/Tool/JavaCommon.py new/scons-3.0.5/src/engine/SCons/Tool/JavaCommon.py
--- old/src/engine/SCons/Tool/JavaCommon.py 2019-03-27 02:16:32.000000000 +0300
+++ new/src/engine/SCons/Tool/JavaCommon.py 2019-06-04 10:44:01.000000000 +0300
@@ -403,7 +403,8 @@
java_macos_version_include_dir = '/System/Library/Frameworks/JavaVM.framework/Versions/%s*/Headers/'
-java_linux_include_dirs = ['/usr/lib/jvm/default-java/include',
- '/usr/lib/jvm/java-*/include']
+java_linux_include_dirs = ['/usr/lib/jvm/*/include',
+ '/opt/*jdk-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 = ['/usr/lib/jvm/java-*-sun-%s*/include',
|
