File tree 2 files changed +3
-10
lines changed
2 files changed +3
-10
lines changed Original file line number Diff line number Diff line change 12
12
['uname_m=="s390" or uname_m=="s390x"' , {
13
13
'target_arch' : 's390'
14
14
}],
15
- ['uname_m=="ppc64"' , {
16
- 'target_arch' : 'ppc64'
17
- }],
18
- ['uname_m=="ppc64le"' , {
19
- 'target_arch' : 'ppc64le'
20
- }],
21
15
['OS=="win"' , {
22
16
'javahome%' : '<!(node findJavaHome.js)'
23
17
}],
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ main () {
28
28
else
29
29
jre_dir=" ${java_home} /lib"
30
30
fi
31
-
31
+
32
32
local lib_dir=" "
33
33
if [[ " ${os} " == " linux" && ! " ${java_version} " =~ (6| 7| 8) ]]; then
34
34
# no arch on JDK 9+
@@ -42,9 +42,8 @@ main () {
42
42
elif [[ " ${os} " == " linux" ]] && [[ " ${target_arch} " == " s390x" || " ${target_arch} " == " s390" ]]; then
43
43
if [[ -d ${jre_dir} /s390x/classic ]]; then lib_dir=" ${jre_dir} " /s390x/classic; else lib_dir=" ${jre_dir} " /s390/classic; fi
44
44
elif [[ " ${os} " == " linux" ]] && [[ " ${target_arch} " == " ppc64" || " ${target_arch} " == " ppc" ]]; then
45
- if [[ -d ${jre_dir} /ppc64/classic ]]; then lib_dir=" ${jre_dir} " /ppc64/classic; fi
46
- elif [[ " ${os} " == " linux" ]] && [[ " ${target_arch} " == " ppc64le" || " ${target_arch} " == " ppcle" ]]; then
47
- if [[ -d ${jre_dir} /ppc64le/classic ]]; then lib_dir=" ${jre_dir} " /ppc64le/classic; else lib_dir=" ${jre_dir} " /ppc64le/server; fi
45
+ target_arch=` uname -m`
46
+ if [[ -d ${jre_dir} /${target_arch} /classic ]]; then lib_dir=" ${jre_dir} " /${target_arch} /classic; else lib_dir=" ${jre_dir} " /${target_arch} /server; fi
48
47
elif [[ " ${os} " == " mac" ]]; then
49
48
lib_dir=" ${jre_dir} /server"
50
49
else
You can’t perform that action at this time.
0 commit comments