Skip to content

Commit cd6860a

Browse files
authored
Merge pull request #439 from swsharp/fix/issue437alt
fix for ppc64le build that does not override target_arch in node-gyp
2 parents b01b9c1 + 0951b54 commit cd6860a

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

binding.gyp

-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@
1212
['uname_m=="s390" or uname_m=="s390x"', {
1313
'target_arch': 's390'
1414
}],
15-
['uname_m=="ppc64"', {
16-
'target_arch': 'ppc64'
17-
}],
18-
['uname_m=="ppc64le"', {
19-
'target_arch': 'ppc64le'
20-
}],
2115
['OS=="win"', {
2216
'javahome%': '<!(node findJavaHome.js)'
2317
}],

find_java_libdir.sh

+3-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ main () {
2828
else
2929
jre_dir="${java_home}/lib"
3030
fi
31-
31+
3232
local lib_dir=""
3333
if [[ "${os}" == "linux" && ! "${java_version}" =~ (6|7|8) ]]; then
3434
# no arch on JDK 9+
@@ -42,9 +42,8 @@ main () {
4242
elif [[ "${os}" == "linux" ]] && [[ "${target_arch}" == "s390x" || "${target_arch}" == "s390" ]]; then
4343
if [[ -d ${jre_dir}/s390x/classic ]]; then lib_dir="${jre_dir}"/s390x/classic; else lib_dir="${jre_dir}"/s390/classic; fi
4444
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
4847
elif [[ "${os}" == "mac" ]]; then
4948
lib_dir="${jre_dir}/server"
5049
else

0 commit comments

Comments
 (0)