X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/70a744a4845d447d04c6a6dcf194053c05096761..c64a0461b9b72486a0d3328018e43fbb25a19999:/packages/jack/jack.sh

diff --git a/packages/jack/jack.sh b/packages/jack/jack.sh
index 42e3cbb7..c439255d 100755
--- a/packages/jack/jack.sh
+++ b/packages/jack/jack.sh
@@ -4,7 +4,15 @@
 export ANDROID_DATA=@TERMUX_PREFIX@/var/android/
 mkdir -p $ANDROID_DATA/dalvik-cache
 
-LD_LIBRARY_PATH=/system/lib \
+# Find the right lib folder for dalvikvm. We cannot take LD_LIBRARY_PATH
+# as is since it contains Termux-supplied libraries which may clash with
+# system ones.
+LIBFOLDER=/system/lib
+if test -d /system/lib64; then
+	LIBFOLDER=/system/lib64
+fi
+
+LD_LIBRARY_PATH=$LIBFOLDER \
 		exec dalvikvm -Xmx256m \
 		-Djava.io.tmpdir=@TERMUX_PREFIX@/tmp \
 		-cp @TERMUX_PREFIX@/share/dex/jack.jar com.android.jack.Main \